Commit Graph

36768 Commits

Author SHA1 Message Date
silicons 4da1d0b73c Update human_defense.dm (#13002) 2020-08-09 16:06:53 +02:00
CitadelStationBot 56e88c10b2 Automatic changelog generation for PR #13075 [ci skip] 2020-08-09 09:01:55 -05:00
Winter Flare 76293ee032 My balls are raw. Meatballs, that is. (#13075)
* Food Processor produces Raw Meatball

* No nutrition loss from slabs.
2020-08-09 16:01:52 +02:00
CitadelStationBot b5f33274b5 Automatic changelog generation for PR #12933 [ci skip] 2020-08-09 08:57:57 -05:00
silicons 07e2423c22 regarding malf ais, apcs, space, and engineering cyborg grippers (#12933)
* Update areas.dm

* Update apc.dm

* Update apc.dm
2020-08-09 15:57:53 +02:00
silicons 0ff1d152a1 Update traumas.json (#13050) 2020-08-09 15:47:23 +02:00
CitadelStationBot cac062a28d Automatic changelog generation for PR #13022 [ci skip] 2020-08-09 08:42:01 -05:00
silicons 5abab38613 increases space levels to 4 (#13022)
* Update map_config.dm

* Update code/modules/mapping/map_config.dm

Co-authored-by: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>

Co-authored-by: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
2020-08-09 15:41:58 +02:00
CitadelStationBot ccfe29302f Automatic changelog generation for PR #11699 [ci skip] 2020-08-09 08:14:29 -05:00
Seris02 635a42e102 yeet (#11699) 2020-08-09 15:14:25 +02:00
CitadelStationBot d33384e739 Automatic changelog generation for PR #13076 [ci skip] 2020-08-09 07:49:13 -05:00
silicons a950adc0df Update regalrat.dm (#13076) 2020-08-09 14:49:10 +02:00
CitadelStationBot f96989c029 Automatic changelog generation for PR #12853 [ci skip] 2020-08-09 07:46:25 -05:00
silicons f20f01cc6b Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
2020-08-09 05:46:21 -07:00
CitadelStationBot 60a29174fb Automatic changelog generation for PR #13047 [ci skip] 2020-08-09 07:45:53 -05:00
silicons 1c2e42136c Merge pull request #13047 from Sishen1542/tbat
replaces box whiteship tbaton with truncheon
2020-08-09 05:45:50 -07:00
CitadelStationBot e103fec532 Automatic changelog generation for PR #13040 [ci skip] 2020-08-09 07:44:17 -05:00
silicons ed07497835 Merge pull request #13040 from Sishen1542/blockstool
funny chair loses block chance and gains active block/parry
2020-08-09 05:44:13 -07:00
CitadelStationBot 4dbc4096ca Automatic changelog generation for PR #13051 [ci skip] 2020-08-09 07:44:03 -05:00
silicons 70c22d55af Merge pull request #13051 from kappa-sama/patch-38
juice spilled
2020-08-09 05:43:59 -07:00
CitadelStationBot 2ff084cf4e Automatic changelog generation for PR #13053 [ci skip] 2020-08-09 07:43:40 -05:00
silicons 8ef539b417 Merge pull request #13053 from kappa-sama/patch-39
makes cargo's Dirty Magazines 3x cheaper
2020-08-09 05:43:37 -07:00
CitadelStationBot 52a1da766a Automatic changelog generation for PR #13054 [ci skip] 2020-08-09 07:42:34 -05:00
silicons fb43e9a2d2 Merge pull request #13054 from KeRSedChaplain/zombies!
Improves zombies, the gimped threat
2020-08-09 05:42:31 -07:00
CitadelStationBot 1e6376f3c3 Automatic changelog generation for PR #13060 [ci skip] 2020-08-09 07:41:58 -05:00
silicons 25d7b15478 Merge pull request #13060 from Hatterhat/timestop-katana
wizard timestop parrying katana
2020-08-09 05:41:55 -07:00
CitadelStationBot b8b628b37f Automatic changelog generation for PR #13085 [ci skip] 2020-08-09 07:41:29 -05:00
silicons cd18e3f4d3 Merge pull request #13085 from Hatterhat/glaive-parry-cont
KC-G Phase 2.1 - Parry Tweaks
2020-08-09 05:41:26 -07:00
CitadelStationBot 9437bcda91 Automatic changelog generation for PR #13084 [ci skip] 2020-08-09 07:41:14 -05:00
silicons d2f5c6688b Merge pull request #13084 from Putnam3145/ic-wording-fix
Made IC issue wording less salt-assuming
2020-08-09 05:41:10 -07:00
CitadelStationBot 57b02b10f9 Automatic changelog generation for PR #13082 [ci skip] 2020-08-09 07:40:00 -05:00
silicons 3068accd2b Merge pull request #13082 from Putnam3145/anaphro
Removed (an)aphrodisiacs.
2020-08-09 05:39:56 -07:00
CitadelStationBot d9595e0f81 Automatic changelog generation for PR #13081 [ci skip] 2020-08-09 07:39:46 -05:00
silicons d25daec117 Merge pull request #13081 from Putnam3145/ethereals
Ports ethereals from TG
2020-08-09 05:39:43 -07:00
Letter N 773509719a TGUI-Go for launch 2020-08-09 20:39:04 +08:00
CitadelStationBot 2bd75034c9 Automatic changelog generation for PR #13078 [ci skip] 2020-08-09 07:38:27 -05:00
silicons ba6eefc945 Merge pull request #13078 from Putnam3145/fix-reroll
Made traitor reroll reroll to MI13 only.
2020-08-09 05:38:23 -07:00
CitadelStationBot bf1e9b5c1e Automatic changelog generation for PR #13079 [ci skip] 2020-08-09 07:37:45 -05:00
silicons bd65c8efc6 Merge pull request #13079 from Hatterhat/parry-text
parry counterattack text now actually shows up
2020-08-09 05:37:42 -07:00
CitadelStationBot 719e5a7c80 Automatic changelog generation for PR #13066 [ci skip] 2020-08-09 07:37:11 -05:00
silicons d9764bf5ea Merge pull request #13066 from timothyteakettle/make-speech-verbs-dna-based
speech verbs now copy through dna copying
2020-08-09 05:37:08 -07:00
CitadelStationBot 0f732ef295 Automatic changelog generation for PR #13068 [ci skip] 2020-08-09 07:36:54 -05:00
silicons 88cb61b08a Merge pull request #13068 from Hatterhat/med-stack-buff
sterilized gauze, ointment and suture stacksizes
2020-08-09 05:36:51 -07:00
CitadelStationBot dadd50ca44 Automatic changelog generation for PR #13069 [ci skip] 2020-08-09 07:35:11 -05:00
silicons 3acd4ac6de Merge pull request #13069 from Chiirno/radioactive-port
Ports TG #51879 - Makes rads glow, buffs rad goggles
2020-08-09 05:35:08 -07:00
Letter N 186482ecef map fix 2020-08-09 19:50:45 +08:00
Letter N f1c4a7f6ac Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-09 14:54:16 +08:00
Letter N 2615506ae9 oops, forgot about this 2020-08-09 13:18:10 +08:00
Letter N 4bed3a5349 OH FUCK 2020-08-09 12:49:14 +08:00
Putnam bdee7bdc63 linters are always your friend 2020-08-08 21:38:53 -07:00