Commit Graph

23955 Commits

Author SHA1 Message Date
Ghommie
b95f910a4e macros 2019-10-07 17:32:16 +02:00
Ghommie
5232728ee7 Ports "Adds three new .38 ammo types", also lazily adding .357 AP 2019-10-07 05:25:47 +02:00
CitadelStationBot
7dada70447 Automatic changelog generation for PR #9385 [ci skip] 2019-10-04 01:15:32 -05:00
kevinz000
828fe6e555 Merge pull request #9385 from Sishen1542/hypereut
fixing divine lightblade (chaplain hypereut) having energy reflect
2019-10-03 23:15:29 -07:00
deathride58
2058cbd09f Merge pull request #9390 from Ghommie/Ghommie_cit212
Ensuring altdisarm() works as intended.
2019-10-03 20:16:05 -04:00
CitadelStationBot
8801781435 Automatic changelog generation for PR #9394 [ci skip] 2019-10-03 19:15:24 -05:00
deathride58
89875bfe98 Merge pull request #9394 from EmeraldSundisk/deltafeex
Unfucks Delta's cargo keycard device.
2019-10-03 20:15:22 -04:00
CitadelStationBot
b678ecc5a3 Automatic changelog generation for PR #9393 [ci skip] 2019-10-03 19:13:01 -05:00
deathride58
6e9a2553af Merge pull request #9393 from jakeramsay007/Even-More-Bugfixes
Fixes AIs being unable to talk through holopads
2019-10-03 20:12:59 -04:00
deathride58
35392d5dd0 Merge pull request #9396 from Citadel-Station-13/iconfixdonator
fixes bad icon path
2019-10-03 20:12:17 -04:00
kevinz000
ccf49f8d21 Merge pull request #9398 from BlackMajor/Yeet
Stops ghosts from stealing your insurance details.
2019-10-03 05:19:46 -07:00
BlackMajor
02f0e4dd84 Ghosts stop stealing my paper work 2019-10-03 19:16:00 +13:00
BlackMajor
373afcf09e Merge pull request #12 from Citadel-Station-13/master
Update master
2019-10-03 19:05:17 +13:00
Jay
70cbd8c1ca fixes bad icon path 2019-10-02 22:11:42 -05:00
EmeraldSundisk
5fee649d55 Update DeltaStation2.dmm 2019-10-02 15:18:08 -07:00
Chayse Ramsay
8cbd7d6c06 Fixes AIs being unable to talk through holopads 2019-10-02 21:14:11 +01:00
Ghommie
4855474955 Making sure altdisarm() works as intended. 2019-10-02 19:39:23 +02:00
Sishen
8b766130f8 Update eutactic_blades.dm 2019-10-02 12:48:17 -04:00
CitadelStationBot
f6c80ddc48 Automatic changelog generation for PR #9365 [ci skip] 2019-10-02 02:06:16 -05:00
kevinz000
08ed166c08 Merge pull request #9365 from Ghommie/Ghommie-cit211
Fixing an issue with DNA scanners maintenance hatches with sleeper code updates.
2019-10-02 00:06:13 -07:00
CitadelStationBot
1bf46e2152 Automatic changelog generation for PR #9373 [ci skip] 2019-10-02 02:02:07 -05:00
kevinz000
1aac0942e9 Merge pull request #9373 from Trilbyspaceclone/beepalm
Beebalm and Honeybalm plants
2019-10-02 00:02:05 -07:00
kevinz000
af9336edde Merge pull request #9366 from Raptorizer/MelonSeedBuff
Equalized the power of the melon seed.
2019-10-02 00:01:05 -07:00
kevinz000
a177e5a457 Merge pull request #9364 from Ghommie/Ghommie-cit206
Fixing the blood cult radial menu unholy flask option's icon.
2019-10-01 23:59:49 -07:00
CitadelStationBot
7320863b52 Automatic changelog generation for PR #9380 [ci skip] 2019-10-02 01:58:29 -05:00
kevinz000
657321e36b Merge pull request #9380 from Ghommie/Ghommie_cit212
refactoring and fixing altdisarm() exploits (ergo pushing people over directional windows etc).
2019-10-01 23:58:27 -07:00
Sishen
a2a6fa17fe Update eutactic_blades.dm 2019-10-01 23:33:14 -04:00
Ghommie
d245a9d28d addendum 2019-10-02 00:42:19 +02:00
Ghommie
2a84162c59 incorrect number of macro arguments 2019-10-02 00:38:58 +02:00
Ghommie
81fc0c1b32 more foolproofing. 2019-10-02 00:37:02 +02:00
Ghommie
e635a05d16 errors. 2019-10-01 23:43:38 +02:00
Ghommie
d2300765b2 adjacency checks. 2019-10-01 23:16:47 +02:00
Ghommie
cfcd325778 reworking the shoving people action. 2019-10-01 23:13:08 +02:00
Ghommie
340f8498a3 Fixes some more issues with shoving people. 2019-10-01 22:11:41 +02:00
deathride58
35b54f9b53 Merge pull request #9376 from Citadel-Station-13/flightgoggles
Flight Goggles - Donator
2019-10-01 13:43:06 -04:00
CitadelStationBot
96bd6ecc06 Automatic changelog generation for PR #9367 [ci skip] 2019-10-01 02:12:34 -05:00
kevinz000
250c6ed986 Merge pull request #9367 from Poojawa/totally-radical
Totally RADical. Rad levels for Medhud, radiation flags added to storage, suits.
2019-10-01 00:12:32 -07:00
Jay
e0b8d28386 donator item 2019-09-30 22:16:27 -05:00
TrilbySpaceClone
3f893195bf tested! 2019-09-30 11:42:07 -04:00
Poojawa
9bd6f83034 Applies rad_flags to a lot of common items + bluespace bags
Also applies fireproofing to Captain's bag. Eng Sachel /duffle get it too for consistency.
2019-09-28 03:22:17 -05:00
Poojawa
30e6445c0a Suit Storage now purges radation contamination 2019-09-28 03:18:31 -05:00
Poojawa
041a4b4ed1 Corrects scanner measurment information 2019-09-28 03:18:00 -05:00
CitadelStationBot
0301683ae1 Automatic changelog generation for PR #9189 [ci skip] 2019-09-28 02:40:05 -05:00
kevinz000
6e55fec7bd Merge pull request #9189 from Sishen1542/gatling
[READY] craftable laser minigun, because why not
2019-09-28 00:40:02 -07:00
CitadelStationBot
99f61ec835 Automatic changelog generation for PR #9191 [ci skip] 2019-09-28 02:38:10 -05:00
kevinz000
0febc1977a Merge pull request #9191 from Linzolle/fireman
Ports fireman carrying from /tg/
2019-09-28 00:38:08 -07:00
CitadelStationBot
fb26944a42 Automatic changelog generation for PR #9267 [ci skip] 2019-09-28 02:28:45 -05:00
kevinz000
7c3036f027 Merge pull request #9267 from Tupinambis/EngineeringCriticalFix
Gives the Endivend Upgraded RCDs by default, instead of Autolathe ones.
2019-09-28 00:28:43 -07:00
CitadelStationBot
d5e9492d2b Automatic changelog generation for PR #9336 [ci skip] 2019-09-28 02:26:53 -05:00
kevinz000
8d9520ee58 Merge pull request #9336 from Thalpy/beakerpH_tweaks
Tweaks how beakers melt in response to poll and feedback. Allows syringe/dropper use on beakers in heaters.
2019-09-28 00:26:51 -07:00