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 |
|
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 |
|
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 |
|
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 |
|
Putnam
|
425f532f76
|
WHOOPS
|
2020-01-31 13:12:50 -08:00 |
|
Putnam
|
809f57a15d
|
also added kill-once objectives
|
2020-01-31 12:25:19 -08:00 |
|
Putnam
|
29e0ac52c4
|
fuzzy objectives
|
2020-01-31 11:52:05 -08:00 |
|
kevinz000
|
0e1c46150f
|
Merge pull request #10767 from KeRSedChaplain/gangnerf
Removes stim packs from gangs
|
2020-01-29 16:24:51 -07:00 |
|
Ghom
|
44c141f009
|
Merge branch 'master' into hugbox_meteor_time
|
2020-01-29 02:28:12 +01:00 |
|
Putnam
|
d358913bde
|
linter is right, whoops
|
2020-01-28 17:26:32 -08:00 |
|
Ghom
|
3671f58612
|
Merge pull request #10751 from Citadel-Station-13/kevinz000-patch-14-1
traitor+bro now have a minimum population of 25
|
2020-01-29 02:16:38 +01:00 |
|
kevinz000
|
3bf0e1d5c4
|
Merge pull request #10701 from Ghommie/Ghommie-cit527
Ported further runtime fixes by AnturK.
|
2020-01-28 17:57:26 -07:00 |
|
KeRSe
|
9c18d4fdad
|
makes stimulants no longer purchasable by gangs
|
2020-01-28 15:53:29 -05:00 |
|
Putnam
|
8df9a051ec
|
it compiles now, ready for testmerge probs
|
2020-01-27 19:09:04 -08:00 |
|
kevinz000
|
74fb726b8d
|
Update traitor_bro.dm
|
2020-01-27 03:27:09 -07:00 |
|
Putnam
|
233aeaa456
|
removed some suggested bad possible contraband
|
2020-01-26 19:03:09 -08:00 |
|
kevinz000
|
8b4a050ad3
|
ok
|
2020-01-25 22:03:53 -07:00 |
|
Putnam
|
37777c4cc7
|
Removed the wirecutting one
|
2020-01-25 13:37:40 -08:00 |
|
Ghommie
|
856ef236f3
|
Further runtime fixes by AnturK.
|
2020-01-24 23:01:30 +01:00 |
|
Putnam
|
c58b4daa35
|
collectors too
this doesn't compile but like. it's a draft
|
2020-01-24 11:58:58 -08:00 |
|
Putnam
|
847b3c0a09
|
Fixed flavor objectives and added more.
|
2020-01-24 10:46:07 -08:00 |
|
Ghommie
|
5644617786
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450
|
2020-01-20 20:59:38 +01:00 |
|
Putnam
|
815b4f033d
|
made flavor things a game option + more hoard
|
2020-01-20 04:13:54 -08:00 |
|
Putnam
|
dfaa3bf15c
|
Added another flavor obj, "horde" to "hoard"
|
2020-01-20 03:46:44 -08:00 |
|
Putnam
|
67c2fdca52
|
more flavor objectives
|
2020-01-20 01:20:42 -08:00 |
|
Putnam
|
8e674817a9
|
errors
|
2020-01-20 00:30:18 -08:00 |
|
Putnam
|
06c66617e6
|
m o r e traitor objectives
|
2020-01-19 18:58:10 -08:00 |
|
Putnam
|
5eba760aa8
|
Reworked survivalist
|
2020-01-18 22:07:54 -08:00 |
|
Putnam
|
e1cf63e0ac
|
Greentext tweaked
|
2020-01-18 21:32:42 -08:00 |
|
Ghommie
|
c14439494a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-12 19:18:03 +01:00 |
|
AffectedArc07
|
16a37e2769
|
Standardises all files from CRLF to LF
|
2020-01-12 14:28:01 +00:00 |
|
Ghommie
|
825b4f01c2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-10 02:26:19 +01:00 |
|
kevinz000
|
2944a902c6
|
Merge pull request #10447 from Arturlang/Bloodsucker_tweaks
[READY] Bloodsucker tweaks
|
2020-01-08 13:36:24 -08:00 |
|
Artur
|
c438d39eb3
|
Initial Commit
|
2020-01-05 22:32:29 +01:00 |
|
Ghommie
|
686a76dd1d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-04 13:35:05 +01:00 |
|