lolman360
fee304fb19
Update medical_designs.dm
2020-08-09 22:55:10 +10:00
lolman360
308d77da7c
Merge branch 'master' into plumb
2020-08-09 22:48:18 +10: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
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
silicons
4dd51f3d9c
fix
2020-08-06 23:48:05 -07:00
silicons
72d0f2a4a3
AAAAAAAA
2020-08-06 23:43:14 -07:00
silicons
65839060c9
Fixes
2020-08-06 23:39:57 -07:00
silicons
3640a33ff6
e
2020-08-06 23:22:53 -07:00
silicons
bcfc601c7a
sigh
2020-08-06 23:11:09 -07:00
silicons
8edb374a20
sigh
2020-08-06 23:09:02 -07:00
silicons
1586625e6b
Merge pull request #12960 from timothyteakettle/loadout-you-say
...
loadout changes part 1: adds subcategories to the loadout
2020-08-06 21:59:13 -07:00
Letter N
cc98f50eb6
what if slabs still show things even if ratvar is free? Does not fix "the sleeper" though
2020-08-07 11:25:36 +08:00
timothyteakettle
e773062b9a
reverse the loadout update
2020-08-07 03:58:19 +01:00
Dan-Neposh
9e62c7b7c3
Improves zombies, the gimped threat
...
Makes zombies take no stamina damage due to being a reanimated corpse, makes zombies not enter softcrit (but still hardcrit for the fake death thing), gives the romerol kit a guide on proper usage of the chem.
2020-08-06 22:43:15 -04:00
silicons
6876edbd85
Merge pull request #12992 from Hatterhat/rifle-book-pt2
...
unatomic as shit PR about nukie guns
2020-08-06 19:40:09 -07:00
