 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 |
|
|
Ghommie
|
bb7bfc04cc
|
Replaces EXCEPTION() with stack_trace() and CRASH()
|
2020-03-05 01:47:04 +01:00 |
|
|
kevinz000
|
1e99cd0bfe
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-03-03 03:08:41 -07:00 |
|
|
kevinz000
|
e39d7fa49d
|
Merge pull request #11259 from Ghommie/Ghommie-cit590
Porting update_icon improvements.
|
2020-02-28 04:30:12 -07:00 |
|
|
kevinz000
|
25f86c18d1
|
Merge pull request #11260 from Kraseo/i-hate-gangs
Removes soporific sniper rifle rounds from gang uplinks
|
2020-02-28 04:29:22 -07:00 |
|
|
kevinz000
|
56eab760fc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-27 20:11:36 -07:00 |
|
|
kevinz000
|
a92baba125
|
Merge pull request #11220 from Kraseo/powersink-of-tc
Gives traitors with power-draining sabotage objective a free powersink
|
2020-02-27 00:59:20 -07:00 |
|
|
Kraseo
|
9da493b483
|
i genuinely do not like anything robustin has ever touched in his lifetime
|
2020-02-27 02:28:13 +01:00 |
|
|
Ghommie
|
fc76cd9a9b
|
Porting update_icon improvements. Part 1.
|
2020-02-27 01:21:03 +01:00 |
|
|
Ghom
|
9355e9319b
|
Merge pull request #11110 from Hatterhat/hyper-96-aus-unk
you kids like extend votes?
|
2020-02-24 16:39:16 +01:00 |
|
|
Kraseo
|
80ebdc44c7
|
moral of the story is doublecheck your code
|
2020-02-24 14:13:52 +01:00 |
|
|
Kraseo
|
08829fe535
|
why don't they get a powersink by default
|
2020-02-24 14:03:18 +01:00 |
|
|
Hatterhat
|
b89a2314a2
|
mmm that's compiling i don't like that
|
2020-02-22 16:17:51 -06:00 |
|
|
kevinz000
|
f6542b381c
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 23:29:25 -07:00 |
|
|
Ghommie
|
8fbfd07692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-22 00:55:32 +01:00 |
|
|
kevinz000
|
a784a74ccb
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 13:35:26 -07:00 |
|
|
Ghom
|
608bb0a04c
|
Merge pull request #10649 from kevinz000/hijack
Completely reworks the hijack objective, and shuttle hijacking in general
|
2020-02-20 14:40:08 +01:00 |
|
|
Putnam
|
71c71766e6
|
one of those runtimes that will never show up in play but boy howdy
|
2020-02-19 21:53:22 -08:00 |
|
|
kevinz000
|
2dd5a0cfb8
|
Merge branch 'master' into hijack
|
2020-02-19 22:25:31 -07:00 |
|
|
kevinz000
|
c7273c03be
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-19 19:12:27 -07:00 |
|
|
kevinz000
|
0e4692c63d
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-18 18:16:34 -07:00 |
|
|
Putnam
|
a9edff6e56
|
Supermatter sabotage no longer shows up with no supermatter
|
2020-02-18 11:51:03 -08:00 |
|
|
necromanceranne
|
c79ecf4db7
|
So no mech logging, huh?
|
2020-02-16 22:56:10 +11:00 |
|
|
kevinz000
|
7ee04aa608
|
Merge pull request #10998 from Ghommie/Ghommie-cit569
Something about the in operator and spaceDMM version update.
|
2020-02-15 12:17:37 -07:00 |
|
|
Arturlang
|
cf980b52ac
|
Fuck valentines
|
2020-02-14 00:01:07 +02:00 |
|
|
kevinz000
|
eca0e0f2dc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-13 00:39:20 -07:00 |
|
|
Ghommie
|
c34714cb90
|
Something about the in operator and spaceDMM version update.
|
2020-02-10 07:37:59 +01:00 |
|
|
Ghom
|
506f1199ad
|
I have a bad habit to edit people's (especially trilby) PRs out of the wild. Sorry
|
2020-02-09 02:56:17 +01:00 |
|
|
Ghom
|
ea9bdcd087
|
Update gangs.dm
|
2020-02-09 02:49:20 +01:00 |
|
|
Trilbyspaceclone
|
90a1b249f1
|
Update gangs.dm
|
2020-02-08 20:39:45 -05:00 |
|
|
Ghom
|
1dfba9f416
|
Merge pull request #10957 from Putnam3145/fix-occasional-dynamic-runtime
Fixes a spurious dynamic runtime if nobody votes
|
2020-02-07 22:41:48 +01:00 |
|
|
Putnam
|
b4faac50a9
|
yeah "null" is bad juju. why did i do that
|
2020-02-07 04:41:16 -08:00 |
|
|
kevinz000
|
62b0e62952
|
Merge pull request #10623 from Putnam3145/antag-overhaul
Better antag objectives: for real this time
|
2020-02-06 16:25:22 -07:00 |
|
|
Ghommie
|
5dc1de1d04
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-05 04:34:54 +01:00 |
|
|
kevinz000
|
6a8a606f97
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-04 16:01:25 -07:00 |
|
|
kevinz000
|
13df3dbb05
|
Merge pull request #10867 from Ghommie/Ghommie-cit551
Further buff and fix to the clown ops' tearstache grenade.
|
2020-02-04 03:55:22 -07:00 |
|
|
Ghommie
|
a726f09201
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-04 03:54:52 +01:00 |
|
|
Ghom
|
5df6566f01
|
Update clown_weapons.dm
|
2020-02-03 20:44:58 +01:00 |
|
|
Putnam
|
88ce25a09b
|
hopefully fixing the once-assassin
|
2020-02-03 08:10:45 -08:00 |
|
|
Putnam
|
52432ed0a7
|
too many dynamic changes for my sanity
|
2020-02-03 07:12:27 -08:00 |
|
|
Putnam
|
53cad493a7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into antag-overhaul
|
2020-02-03 03:17:23 -08:00 |
|
|
Ghom
|
d5166322dc
|
I can't believe I have done this.
|
2020-02-03 08:23:20 +01:00 |
|
|
Ghommie
|
0428b05cff
|
Oh snap
|
2020-02-03 07:20:16 +01:00 |
|
|
Ghommie
|
81b5fe2de3
|
Further buff and fix for clown ops tearstache nade.
|
2020-02-03 07:08:47 +01:00 |
|
|
Putnam
|
e812844c70
|
Revert "</span>"
This reverts commit d6d01d848c.
|
2020-02-01 21:05:27 -08:00 |
|
|
Ghommie
|
95db5084ab
|
Screw commit history.
|
2020-02-02 01:26:04 +01:00 |
|
|
Putnam
|
d6d01d848c
|
</span>
|
2020-02-01 06:01:54 -08:00 |
|
|
Putnam
|
50a53c6558
|
aaand a formatting oddity
|
2020-02-01 00:47:44 -08:00 |
|
|
Putnam
|
3d9e84a3f8
|
Tweaks and fixes
|
2020-02-01 00:23:45 -08:00 |
|
|
Ghommie
|
07b6d278a1
|
fixed and brutalized clown op slippery weapons a little.
|
2020-02-01 04:48:40 +01:00 |
|