cmdrunematti/Delta-v
1
0
Fork 0
mirror of https://github.com/DeltaV-Station/Delta-v.git synced 2026-10-06 14:27:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,201 Commits 27 Branches 0 Tags
09ce2fad5db204cb2ae9747c73fa451ea0b0c8d7
Commit Graph
24201 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
MACMAN2003 09ce2fad5d Fix air not existing in corner window tiles (#25926) 
let there be air

air time

(cherry picked from commit 24fd1a93ff)
 2024-03-17 14:43:52 +01:00
Emisse 6a4763ef4c infiltrator update (#25923) 
(cherry picked from commit 463817056e)
 2024-03-17 14:43:51 +01:00
AlexUm & XGabriel08X d36b0b69e4 Barber scissors in uplink and chameleon bundle. (#25920) 
scissors

uplink catalog localization and just catalog update, with adding scissors to the chameleon set

(cherry picked from commit 7af183ec72)
 2024-03-17 14:43:40 +01:00
PJBot 3aefff70df Automatic changelog update 
(cherry picked from commit dd79536442)
 2024-03-17 14:43:03 +01:00
Ed 044a47c5dc Remove Hamlet, Smile and Pun Pun from Thief objective (#25921) 
* Update thief.yml

* Update stealTargetGroups.yml

* Update objectiveGroups.yml

* Update pets.yml

(cherry picked from commit faed7a3746)
 2024-03-17 14:43:01 +01:00
Menshin 38adf75d3e Thermomachines now excite the gas mixture they add heat to (#25916) 
Atmospherics thermomachines now properly invalidate tiles they add heat to.

(cherry picked from commit 1e62e445f0)
 2024-03-17 14:42:59 +01:00
PJBot 6dba19b744 Automatic changelog update 
(cherry picked from commit 937238fa67)
 2024-03-17 14:42:56 +01:00
Admiral-Obvious-001 8cd4c6576c Buff zombie resists (#25876) 
* Buff zombie resists

Tweaks zombies to be tankier but still have a similar damage grouping for a specific weakness

* Removed unnecessary values of 1

(cherry picked from commit 0000f1b899)
 2024-03-17 14:42:53 +01:00
PJBot 826b5280e4 Automatic changelog update 
(cherry picked from commit 15a431bdda)
 2024-03-17 14:41:56 +01:00
Nim d65a35bcb4 Slimes can drink fourteenloko (#25889) 
* fourteenloko

* inverse

(cherry picked from commit a846966515)
 2024-03-17 14:41:55 +01:00
PJBot f0797142c3 Automatic changelog update 
(cherry picked from commit 7b7b8642f5)
 2024-03-17 14:41:36 +01:00
Alzore 55483dca32 Vegan Meatball (#24650) 
* veganmeatball

* testedthis

* moreplant

(cherry picked from commit 5f61380209)
 2024-03-17 14:41:35 +01:00
PJBot 431ebfd240 Automatic changelog update 
(cherry picked from commit 5252057144)
 2024-03-17 14:41:33 +01:00
beck-thompsonandbeck 41a50c5908 Lawdrobe update (#25299) 
* Minor lawdrobe changes

* Updates to advertisements, thank you messages, and emaged / contraband inventory

* Removed the 9th lawdrobe advertisement as it was unused

* Removed soap

---------

Co-authored-by: beck <beck3629@uw.edu>

(cherry picked from commit 4b359466cc)
 2024-03-17 14:41:27 +01:00
PJBot 3ab625aa2b Automatic changelog update 
(cherry picked from commit 8d08284e11)
 2024-03-15 11:25:29 +01:00
Doctor-Cpu a57ee32f9d remove cargo pallet from cargo request (#25882) 
(cherry picked from commit 2033dd0337)
 2024-03-15 11:25:16 +01:00
shamp 8c194b5b02 Fix body bags sliding under doors (#25325) 
(cherry picked from commit 90063db717)
 2024-03-15 11:24:56 +01:00
Decortex 1a509f7267 ATV resprite (#25885) 
* Delete Resources/Textures/Objects/Vehicles/atv.rsi/vehicle.png

* Add files via upload

* Delete Resources/Textures/Objects/Vehicles/atv.rsi/Vehicle.png.png

* Add files via upload

* Update meta.json

* Update meta.json

* .

(cherry picked from commit cef8a17726)
 2024-03-15 11:24:47 +01:00
Plykiya b5dea10266 Fix: Syringe requires hands and breaks on change now (#25896) 
Syringe requires hands and breaks on change

Co-authored-by: Plykiya <plykiya@protonmail.com>
(cherry picked from commit 17b80ba96b)
 2024-03-15 11:24:46 +01:00
slarticodefast 1642de1e63 Fix datafield name (#25651) 
(cherry picked from commit 87c89eacd4)
 2024-03-15 11:24:40 +01:00
VelcroboyandJeff a719ee0a79 Map Edits: Arena (#964) 
Co-authored-by: Jeff <velcroboy333@hotmail.com>
 2024-03-14 14:09:09 -05:00
Debug 810d04c511 Update toys.yml 
Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
 2024-03-14 15:31:02 +01:00
DeltaV-Bot d3089e5547 Automatic changelog update 2024-03-13 22:28:03 +00:00
UnicornOnLSD f53daf1acb pebble hotfix two, eletric boogaloo (#943) 
* fix warp points, bombing sites, added mcgriff, paramed job.

* fix solution smh

* added screens and service lights, cargo docks less narrow
 2024-03-13 17:27:44 -05:00
Colin-Tel fc1fb86973 Fix Edge Boxer room access (#960) 
Fixes the Boxer room's access so that a boxer can actually enter it, also slight changes to the dojo.
 2024-03-13 17:26:41 -05:00
DeltaV-Bot b03faf4d4f Automatic changelog update 2024-03-12 15:54:42 +00:00
Debug b6e35d8f5c Update submodule to 212.0.2 (#959) 2024-03-12 16:54:20 +01:00
DeltaV-Bot 6e8c3b9593 Automatic changelog update 2024-03-12 00:31:28 +00:00
GreggandDebug c0f22a8a72 Rules Update (#952) 
* Updated rules 2-5, 2-10, 3-4, 4-8, 6-2, 8-4.

* Added a summary.

* Update Rules.txt

Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>

---------

Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
Co-authored-by: Debug <49997488+DebugOk@users.noreply.github.com>
 2024-03-12 01:31:08 +01:00
DeltaV-Bot 6c43266256 Automatic changelog update 2024-03-11 22:00:20 +00:00
Debug 14447babb8 Remove bad CL entries and try admin changelogs a second time (#958) 
Remove bogus cl entry
 2024-03-11 23:00:00 +01:00
DeltaV-Bot 70ec8faaac Automatic changelog update 2024-03-11 21:44:00 +00:00
Debug 0999c10f2a Fix changelog order and admin changelog (#957) 
* Fix changelog order and admin changelog

* Rename upstream admin file
 2024-03-11 22:43:40 +01:00
Debug 6bd5092853 Fix some trading post oopsies (#956) 
Fix 2 oopsies
 2024-03-11 19:57:03 +00:00
DeltaV-Bot b31c80217e Automatic changelog update 2024-03-11 17:56:32 +00:00
Danger Revolution!andDangerRevoltion c7f9819fb6 minor lawset fixes (#953) 
* minor law changes to stop shitters & reduce confusion

* Update laws.ftl

* space at the end

---------

Co-authored-by: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com>
 2024-03-11 18:56:12 +01:00
DeltaV-Bot f3f719e70f Automatic changelog update 2024-03-11 17:46:07 +00:00
Debug f55bce9f97 Revert "Automatic changelog update" 
This reverts commit 171e56d31c.
 2024-03-11 18:45:35 +01:00
DeltaV-Bot 171e56d31c Automatic changelog update 2024-03-11 17:33:18 +00:00
Debug 4902b7209b Create test.yml 
Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
 2024-03-11 18:20:05 +01:00
VelcroboyandVelcroboy fd09635098 Adds Delta V station beacons (#767) 
* Adds Delta V station beacons

* Duped

* Add corpsman

* Added mantis and shortened names

* Remove escape pod beacon

* Tidy, remove duplicate changes, and update

* Missed Mysta

* remove notes

---------

Co-authored-by: Velcroboy <>
 2024-03-11 16:13:32 +00:00
DeltaV-Bot a807993c3f Automatic Changelog Update (#941) 2024-03-11 15:56:59 +00:00
Debug f2a4a9cfbe Merge pull request #941 from DebugOk/2024/03/08-Trading-posts 
Implmement trading post and finish shuttle refactor cherry-pick
 2024-03-11 16:56:45 +01:00
VMSolidus dfd5e60367 Update DV-pirateradio.yml (#951) 2024-03-11 10:43:59 -05:00
DeltaV-Bot 0028b03140 Automatic Changelog Update (#950) 2024-03-10 23:44:18 +00:00
Adrian16199 a2792cf9db Makes ifriit immune to zombie-fication. (#950) 
Because uh.... higher being.... not really flesh.... pure fire.... gettin zombified? what type of horror is this when it comes to diseases? Now you gonna tell me you can zombify a computer.
 2024-03-10 19:44:04 -04:00
Debug c09afede60 Update deltav.toml 
Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
 2024-03-10 21:16:59 +01:00
github-actions[bot]andDeltaV-Bot 67191e74e4 Update Credits (#948) 
Co-authored-by: DeltaV-Bot <github@delta-v.org>
 2024-03-10 02:10:36 +01:00
DeltaV-Bot 1052250267 Automatic Changelog Update (#661) 2024-03-09 22:45:55 +00:00
Adrian16199 484ca9285d Implement Ifriit (#661) 
* Fixes ifriit.

The mystagogue's guardian.

TO-DO: Figure out how to give the ifriit the actual tool instead of bite that still has the damage propertys of the tool?

* Hands, innatetool DEATH

giving different parent to make the bite attack frick off.
Dont let them shove, simple different attack would make sense.

* forgot to delete that one

* Just going to put this together I suppose?

* I guess his hands atleast work

* whoopsie yaml linter

* Finishing touches and cleaning up.

Not sure how long I will have to living but eh, at the least might aswell finish some PR's

* Eh, i wanted to keep it but i guess not.

* Update misc_startinggear.yml

* Update ifrit.yml

* Innate tooling...

* Makes it work just how its needed to do so.

* brings back the previous pngs
 2024-03-09 23:45:42 +01:00