Timothy Teakettle and GitHub
88fb9d277a
fix lizard snouts ( #13223 )
2020-08-20 22:58:54 +02:00
silicons and GitHub
48652e4b0a
Merge pull request #13202 from tiramisuapimancer/master
...
Makes Ethereal hair their mutcolor instead of white
2020-08-18 18:53:40 -07:00
silicons and GitHub
0331f0cdc3
Merge pull request #13189 from timothyteakettle/revert-13187-revert-13110-cum
...
Revert "[TESTMERGE ONLY] FUCK"
2020-08-18 18:52:52 -07:00
tiramisuapimancer and GitHub
13609ba6e6
Update ethereal.dm
2020-08-17 23:01:01 -08:00
timothyteakettle
d312a5d639
fix tails
2020-08-18 01:32:06 +01:00
timothyteakettle
47424be1c0
tail fix
2020-08-18 00:46:05 +01:00
silicons and GitHub
7d2d4d870c
Merge pull request #13179 from Detective-Google/if-chain-begoen
...
kills an ugly if-chain in inventory code (probably)
2020-08-17 03:13:48 -07:00
Timothy Teakettle and GitHub
f5300750b5
Revert "[TESTMERGE ONLY] FUCK"
2020-08-17 03:18:36 +01:00
silicons and GitHub
4cd731ce11
Revert "cease your shitcode: cum edition"
2020-08-16 19:06:57 -07:00
silicons
8dedcbcf76
Merge branch '13113'
2020-08-16 18:53:35 -07:00
silicons
38959b6120
Merge branch '13141'
2020-08-16 18:46:33 -07:00
silicons
b7b13403b9
Merge branch '13130'
2020-08-16 18:45:54 -07:00
silicons
b56742beb5
Merge branch 'pr-13110'
2020-08-16 18:40:23 -07:00
silicons and GitHub
428bb936aa
Merge pull request #13037 from timothyteakettle/freedom-in-customisation
...
turns 304 lines of snowflake code into 24 lines
2020-08-16 18:35:05 -07:00
Lin and GitHub
2fd3e2dd87
Merge pull request #13092 from Citadel-Station-13/silicons-patch-87
...
active blocking now also considers a stamina damaging projectile's stamina damage to be .. damage
2020-08-16 20:20:29 -05:00
Navier
fc70d3dde2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into DRAKEBORG
2020-08-15 23:13:41 -04:00
Detective Google
9b943ec7a9
yee
2020-08-15 21:29:39 -05:00
MrJWhit
20a9451b56
Update lizardpeople.dm
2020-08-12 21:35:36 -04:00
silicons and GitHub
569cef0e42
Update ethereal.dm
2020-08-11 17:05:32 -07:00
timothyteakettle
2a6490b60c
yes
2020-08-12 00:47:06 +01:00
timothyteakettle
cd8430a897
woops
2020-08-12 00:42:51 +01:00
timothyteakettle
a2721b1ccd
traits
2020-08-12 00:40:49 +01:00
silicons and GitHub
130c3a9480
Merge pull request #13096 from Michiyamenotehifunana/possum
...
Ports Opossums from Desert Rose
2020-08-11 16:19:42 -07:00
Timothy Teakettle
45dae759df
all the homies hate travis
2020-08-11 21:04:29 +01:00
Timothy Teakettle and GitHub
4a2bbe66d6
Merge branch 'master' into cum
2020-08-11 18:30:30 +01:00
silicons and GitHub
df05c5ee4d
Merge pull request #13089 from Putnam3145/fix-sprite-display
...
Demodularization + making certain sprite overlays less hilariously jank
2020-08-11 01:43:21 -07:00
silicons and GitHub
23b235d6ed
Update living_active_block.dm
2020-08-11 01:42:42 -07:00
kiwedespars
3bd2f73449
travis
2020-08-10 21:37:50 -07:00
timothyteakettle
1f240b883f
holy shit
2020-08-11 03:37:04 +01:00
kiwedespars
eb8574d6d6
heretics from tg (with changes)
2020-08-10 19:17:26 -07:00
Timothy Teakettle
24557c415c
i said CEASE
2020-08-10 21:42:52 +01:00
Timothy Teakettle
033fe553e8
cease your shitcode
2020-08-10 21:41:06 +01:00
Michiyamenotehifunana
0f274d5891
Fixes some code anomalies
...
Adds newline to possum code, reverts var invalidation in kilostation's pets
2020-08-10 09:40:23 +08:00
silicons and GitHub
4da1d0b73c
Update human_defense.dm ( #13002 )
2020-08-09 16:06:53 +02:00
Seris02 and GitHub
635a42e102
yeet ( #11699 )
2020-08-09 15:14:25 +02:00
silicons and GitHub
a950adc0df
Update regalrat.dm ( #13076 )
2020-08-09 14:49:10 +02:00
silicons and GitHub
f20f01cc6b
Merge pull request #12853 from LetterN/TGUI-4
...
TGUI4 port
2020-08-09 05:46:21 -07:00
silicons and GitHub
fb43e9a2d2
Merge pull request #13054 from KeRSedChaplain/zombies!
...
Improves zombies, the gimped threat
2020-08-09 05:42:31 -07:00
silicons and GitHub
25d7b15478
Merge pull request #13060 from Hatterhat/timestop-katana
...
wizard timestop parrying katana
2020-08-09 05:41:55 -07:00
silicons and GitHub
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
Michiyamenotehifunana
9b6156ad81
Ports opposums
...
Everything stolen from Desert Rose, including sprites. All credits to whoever made it there.
2020-08-09 16:35:12 +08: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
silicons and GitHub
0decd32e54
Update living_active_block.dm
2020-08-08 18:27:54 -07:00
Putnam
8f77a2b16d
Demodularized a bit.
2020-08-08 13:38:33 -07:00
Putnam
9bb3ba5c5a
added ethereals
2020-08-08 00:08:43 -07:00
Hatterhat
8ade386190
fucks around with parry text
2020-08-08 00:12:51 -05:00
Hatterhat
029d88ac9d
play a real shin megami tensei game
2020-08-07 03:32:54 -05: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
