Commit Graph

15982 Commits

Author SHA1 Message Date
lolman360
8027706bea Update _box_magazine.dm 2020-08-18 13:45:44 +10:00
lolman360
2d1edc9fa2 Update _box_magazine.dm 2020-08-18 13:30:49 +10:00
lolman360
3aba9eb5a6 kee 2020-08-12 15:11:55 +10:00
lolman360
8c70b56706 whoops 2020-08-11 19:04:59 +10:00
lolman360
472ef6165f imamurderer 2020-08-11 18:52:26 +10:00
silicons
3795bcf2d0 Merge pull request #13097 from zeroisthebiggay/yessalthairpr
Patented Zero Salt PR That Adds One New Hair Style That Is Just Pompadourless Volaju Because
2020-08-10 02:29:47 -07:00
silicons
4da1d0b73c Update human_defense.dm (#13002) 2020-08-09 16:06:53 +02: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
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
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
Seris02
635a42e102 yeet (#11699) 2020-08-09 15:14:25 +02:00
silicons
a950adc0df Update regalrat.dm (#13076) 2020-08-09 14:49:10 +02:00
silicons
f20f01cc6b Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
2020-08-09 05:46:21 -07: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
silicons
fb43e9a2d2 Merge pull request #13054 from KeRSedChaplain/zombies!
Improves zombies, the gimped threat
2020-08-09 05:42:31 -07:00
silicons
25d7b15478 Merge pull request #13060 from Hatterhat/timestop-katana
wizard timestop parrying katana
2020-08-09 05:41:55 -07: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
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
silicons
3068accd2b Merge pull request #13082 from Putnam3145/anaphro
Removed (an)aphrodisiacs.
2020-08-09 05:39:56 -07: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
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
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
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
zerothebigboy
822c17e444 a 2020-08-09 08:07:40 -04:00
Letter N
f1c4a7f6ac Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-09 14:54:16 +08:00
Putnam
bdee7bdc63 linters are always your friend 2020-08-08 21:38:53 -07:00
Letter N
5abcc1c220 reverts this change 2020-08-09 12:00:12 +08:00
Hatterhat
e95dcba705 price nerf, tweaks, aprc 2020-08-08 12:17:56 -05:00
Lin
13d94717f4 Merge pull request #13052 from Citadel-Station-13/silicons-patch-76
fixes laptops not being able to be picked up
2020-08-08 12:05:36 -05:00
Lin
f154623284 Merge pull request #13059 from Citadel-Station-13/silicons-patch-81
immovable rods no longer drop down chasms
2020-08-08 12:02:47 -05:00
Hatterhat
9a862b10e1 the perfect parry update 2020-08-08 10:47:43 -05:00
Letter N
e964b3aabf skillpannel fix, and nyanite fixes. Minified js does not include pai spoilers 2020-08-08 20:04:16 +08:00
Putnam
02c990ab27 Toggle's no longer relevant. 2020-08-08 02:18:58 -07:00
Putnam
9dcfceb8e9 Made IC issue wording less assuming-salt 2020-08-08 01:32:18 -07:00
Letter N
83207baaee reverts nanite thing 2020-08-08 16:30:07 +08:00
Putnam
467f66b2a6 Removed crocin/hexacrocin. 2020-08-08 00:46:30 -07:00
Putnam
9bb3ba5c5a added ethereals 2020-08-08 00:08:43 -07:00
Hatterhat
7c7eff12c3 wizard buyable 2020-08-08 00:52:39 -05:00
Hatterhat
8ade386190 fucks around with parry text 2020-08-08 00:12:51 -05:00
Putnam
5d62e2af23 Made reroll reroll to objectives only. 2020-08-07 21:51:37 -07:00
silicons
795a1fab35 Merge pull request #13048 from Hatterhat/glaive-parry
Proto-Kinetic Glaives Phase 2 - Parrying
2020-08-07 17:29:57 -07:00
Hatterhat
fd8f3781cc test commit please ignore 2020-08-07 17:03:38 -05:00
Hatterhat
c227fc7546 wait, shit 2020-08-07 16:56:53 -05:00
Lynxless
14e35806b9 I hope this works 2020-08-07 16:23:15 -03:00
Hatterhat
029d88ac9d play a real shin megami tensei game 2020-08-07 03:32:54 -05:00
Letter N
9eb7aaa2d1 fixes pumps and reverts this small vending change 2020-08-07 16:12:44 +08:00
silicons
e1e9b77b07 Update immovable_rod.dm 2020-08-07 00:36:04 -07:00
Letter N
5b63f0acce fix fix fix^2 2020-08-07 15:15:34 +08:00
silicons
aa5b99a9d4 make it end 2020-08-07 00:03:59 -07:00