Putnam
|
f670d09a88
|
Made IAA work again (whoops)
|
2020-03-06 21:39:38 -08:00 |
|
Putnam
|
39527ae4a7
|
prevented hijack/martyr from being contractors
|
2020-03-06 17:21:41 -08:00 |
|
Putnam
|
1c37b95c0b
|
renamed "gimmick" to "freeform"
|
2020-03-06 17:21:30 -08:00 |
|
Putnam
|
71ac07426a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into traitor-types
|
2020-03-06 17:03:24 -08:00 |
|
Putnam
|
182e98192c
|
no longer uses that var
|
2020-03-06 17:01:43 -08:00 |
|
Putnam
|
436e781ec9
|
Removed assassin-only, made subterfuge more likely to assassinate
|
2020-03-06 15:37:59 -08:00 |
|
Kraseo
|
ad20fb1a0e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
|
2020-03-06 11:58:11 +01:00 |
|
kevinz000
|
16d6ba9e21
|
Merge pull request #11323 from Ghommie/Ghommie-cit600
Porting a couple material datums code updates and fixes.
|
2020-03-06 00:17:21 -07:00 |
|
kevinz000
|
78b1dcaae4
|
Merge pull request #11330 from Citadel-Station-13/Ghommie-patch-4
Allows blobbernauts to drag objects (but not mobs) again.
|
2020-03-06 00:14:43 -07:00 |
|
kevinz000
|
9420424c8f
|
Merge pull request #11332 from Ghommie/Ghommie-cit603
Replaces EXCEPTION() with stack_trace() and CRASH()
|
2020-03-06 00:14:13 -07:00 |
|
deathride58
|
2e35c09dec
|
Merge pull request #10451 from kevinz000/mobility_flags
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
|
2020-03-05 20:03:56 -05:00 |
|
Ghommie
|
bb7bfc04cc
|
Replaces EXCEPTION() with stack_trace() and CRASH()
|
2020-03-05 01:47:04 +01:00 |
|
Ghom
|
9eedf8c1fb
|
Update blob_mobs.dm
|
2020-03-04 23:34:59 +01:00 |
|
Ghom
|
17488480b1
|
Allows blobbernauts to drag objects (but not mobs) again.
|
2020-03-04 22:43:30 +01:00 |
|
Ghom
|
7a2e0892d3
|
Merge pull request #11277 from kevinz000/sword_point
En garde! (nah just sword pointing)
|
2020-03-04 17:11:39 +01:00 |
|
Ghommie
|
60c7268e37
|
Also fixing bloodsucker coffins.
|
2020-03-04 16:29:09 +01:00 |
|
Ghommie
|
f2c8a7cd6f
|
Porting a couple material datums code updates and fixes.
|
2020-03-04 15:59:46 +01:00 |
|
Kraseo
|
edfe50579e
|
ACTUALLY fixes null runtimes + double contracts
|
2020-03-04 13:17:24 +01:00 |
|
kevinz000
|
6354b48659
|
fix
|
2020-03-03 20:58:06 -07:00 |
|
Putnam
|
3059e48278
|
Removed 30TC thing from martyr/hijack
|
2020-03-03 16:46:41 -08:00 |
|
Ghom
|
284ef326c7
|
Stops ninjas employed by syndies from receiving friendly flavor objectives.
|
2020-03-04 00:36:18 +01:00 |
|
kevinz000
|
1e99cd0bfe
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-03-03 03:08:41 -07:00 |
|
kevinz000
|
49939b0973
|
Update overmind.dm
|
2020-03-02 18:15:18 -07:00 |
|
Kraseo
|
50a1feeb89
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
|
2020-03-02 17:38:08 +01:00 |
|
Ghom
|
9375113426
|
Merge pull request #11041 from Arturlang/kills_blood_tomatoe_succ
Bloodsucker external blood gain rebalancing
|
2020-03-02 16:36:22 +01:00 |
|
Kraseo
|
e5e05d5d61
|
handles cases where stripping plasmamen would not give them what they need to not die
|
2020-03-02 11:47:44 +01:00 |
|
Kraseo
|
648f7793d3
|
proving to the world i'm retarded one commit line at a time
|
2020-03-01 23:56:34 +01:00 |
|
Kraseo
|
ad8013d839
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
|
2020-03-01 23:39:16 +01:00 |
|
Kraseo
|
5da4e5fbcd
|
parte 5: tgui and javascript torture
|
2020-03-01 22:57:39 +01:00 |
|
Kraseo
|
e3c77f2f5a
|
part 4: the one where i slowly go insane
|
2020-03-01 22:05:35 +01:00 |
|
Kraseo
|
ab48a6fa16
|
part 3: do people even read commit logs
|
2020-03-01 19:14:05 +01:00 |
|
Kraseo
|
d93ade7e03
|
part 2: bloody tendency
|
2020-03-01 17:37:18 +01:00 |
|
Kraseo
|
38f7821dd6
|
part 1: battle stream
|
2020-03-01 16:56:13 +01:00 |
|
Ghom
|
20a5ab895f
|
Merge pull request #11268 from raspyosu/vamp-revamp
ongoing vampire ability balance/rework attempt
|
2020-03-01 14:39:03 +01:00 |
|
Putnam
|
7a5366f5dd
|
come to think of it a "cooperative", huh
|
2020-03-01 00:03:12 -08:00 |
|
Putnam
|
6e7406a51a
|
what
|
2020-03-01 00:03:00 -08:00 |
|
Putnam
|
56ab702fa5
|
but how
|
2020-03-01 00:02:16 -08:00 |
|
Putnam
|
31b9dbd4ab
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into traitor-types
|
2020-02-29 23:30:36 -08:00 |
|
Putnam
|
f344af633f
|
finalized.
|
2020-02-29 23:29:24 -08:00 |
|
raspyosu
|
d00596b49d
|
fix cloak not restoring initial move intent sometimes (maybe)
|
2020-03-01 00:24:56 -05:00 |
|
kevinz000
|
93d91b1808
|
Merge remote-tracking branch 'citadel/master' into sword_point
|
2020-02-28 13:39:56 -07:00 |
|
kevinz000
|
8ef68fa36b
|
En garde!
|
2020-02-28 13:35:41 -07:00 |
|
raspyosu
|
5b6da0b350
|
ok
changes that artur suggested guess it makes no sense to add too much flavor
|
2020-02-28 13:29:36 -05:00 |
|
kevinz000
|
e39d7fa49d
|
Merge pull request #11259 from Ghommie/Ghommie-cit590
Porting update_icon improvements.
|
2020-02-28 04:30:12 -07:00 |
|
kevinz000
|
d0eebdbb02
|
Merge pull request #11273 from Arturlang/blob_broacast_exploit
[s] Fixes blob broadcast HTML Injection.
|
2020-02-28 04:28:41 -07:00 |
|
Artur
|
c6fcffe949
|
Made the same mistake...
|
2020-02-28 13:19:27 +02:00 |
|
Artur
|
d6e402aa5d
|
Damned
|
2020-02-28 13:06:28 +02:00 |
|
raspyosu
|
8953877a69
|
makes mesmerize not shitcode
woooooooo
|
2020-02-28 01:01:45 -05:00 |
|
raspyosu
|
43e4877a34
|
rearrange mesmerize end code
linzolle pointed out it doesn't work which is correct and this seems to work just fine now
|
2020-02-28 00:07:14 -05:00 |
|
kevinz000
|
f01a58a795
|
fix
|
2020-02-27 20:15:28 -07:00 |
|