 Putnam
|
5b46af0f88
|
Added a proper extended-lite.
|
2020-03-11 02:47:59 -07:00 |
|
|
Putnam
|
8db3a3ced4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dynamic-tweaks
|
2020-03-11 02:17:16 -07:00 |
|
|
Putnam
|
a724de6dd8
|
Moved disease, revenant from midround to event.
|
2020-03-11 01:40:13 -07:00 |
|
|
Putnam
|
f5bde6a869
|
Let clown ops inherit from nuke ops
|
2020-03-11 01:39:48 -07:00 |
|
|
Putnam
|
f229e8c8fb
|
Enabled clown ops
|
2020-03-11 01:19:54 -07:00 |
|
|
Putnam
|
230138d31d
|
Rejiggered the weights (config needs updated anyway)
|
2020-03-11 01:19:47 -07:00 |
|
|
Putnam
|
bf511d0208
|
Made storytellers have different possible antag-per-pop goals
|
2020-03-10 23:39:14 -07:00 |
|
|
Putnam
|
995fc09c87
|
Made threatening meteors more likely
|
2020-03-10 23:38:47 -07:00 |
|
|
Putnam
|
621ea62d64
|
Added swarmers, portal storm, wormholes to dynamic.
|
2020-03-10 23:21:47 -07:00 |
|
|
kevinz000
|
18471be4ce
|
cult team
|
2020-03-10 20:11:18 -07:00 |
|
|
kevinz000
|
0791f22b62
|
Merge pull request #10702 from Ghommie/Ghommie-cit528
Hey, do you remember that wizard round where everyone tried arming up the nuclear bomb and we all went DELTA RED DELTA RED DELTA RED DELTA ?
|
2020-03-10 17:24:48 -07:00 |
|
|
kevinz000
|
ce8de536b5
|
Merge remote-tracking branch 'citadel/master' into eldritch_affairs
|
2020-03-10 17:24:09 -07:00 |
|
|
Ghom
|
0d7612dcf5
|
[s] Sanitizes ParseSong tempo.
|
2020-03-11 00:29:31 +01:00 |
|
|
Ghommie
|
27a7f754c4
|
Fix runtimes some more.
|
2020-03-10 22:40:06 +01:00 |
|
|
Ghommie
|
2b4b626fac
|
support for items that switch states through update_icon.
|
2020-03-10 16:55:30 +01:00 |
|
|
Ghom
|
b03af0ea9a
|
Update RCL.dm
|
2020-03-10 14:44:33 +01:00 |
|
|
necromanceranne
|
8caea8e83a
|
Ports tg#44633
|
2020-03-10 23:59:50 +11:00 |
|
|
kevinz000
|
832d894e92
|
Merge pull request #11388 from Owai-Seek/crabby-patty-3/1/20
Food Ports / Butter Bear / Food Craft Speed
|
2020-03-10 05:59:24 -07:00 |
|
|
kevinz000
|
e210f7d535
|
Merge pull request #11391 from Ghommie/Ghommie-cit612
Porting "Further update_icon splitup"
|
2020-03-10 05:58:17 -07:00 |
|
|
kevinz000
|
3eac86cf31
|
Merge pull request #11394 from Citadel-Station-13/Ghommie-patch-3
Actually fixing that one overlay.
|
2020-03-10 05:57:18 -07:00 |
|
|
kevinz000
|
bfb75eb26b
|
Merge pull request #11396 from Ghommie/Ghommie-cit613
Ports "Switches out the three billion args of electrocute act for flags"
|
2020-03-10 05:56:28 -07:00 |
|
|
necromanceranne
|
b03d83926a
|
Forgot the scroll
|
2020-03-10 20:27:40 +11:00 |
|
|
Ghommie
|
4143c1963c
|
Porting more legcuffs / bola fixes etcetera
|
2020-03-09 16:20:51 +01:00 |
|
|
Seris02
|
cccd0e9eef
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-03-09 16:49:32 +08:00 |
|
|
Ghommie
|
ee1eea8874
|
Ports "Switches out the three billion args of electrocute act for flags"
|
2020-03-09 04:01:23 +01:00 |
|
|
Ghom
|
f8c18fe5a8
|
Update PDA.dm
|
2020-03-09 00:52:11 +01:00 |
|
|
Ghom
|
1c5aa2f933
|
Merge pull request #11377 from Kraseo/contractor-fixes
Some contractor adjustments & fixes
|
2020-03-09 00:26:54 +01:00 |
|
|
Ghom
|
8878733fc1
|
Merge pull request #11317 from deathride58/WEPORTINSYNTHSBOI
Ports Skyrat's synths (Plus limb rendering overhaul and more)
|
2020-03-09 00:26:06 +01:00 |
|
|
Winter Flare
|
bb9066e9cb
|
Food Additions / Butter Bear
Ports the following from TG:
Chicken Nugget Box
Crab Burger, Bisque, French Onion Soup, Crab Rangoo
Butter Bear aka Terrygold
Tweaks Bisque and Crab Rangoo recipie.
Removes Bacon from Exotic Meat crate.
Adds Spider Eggs to Exotic Meat crate.
|
2020-03-08 14:36:08 -04:00 |
|
|
Ghommie
|
ad4d290ea7
|
WIP
|
2020-03-08 19:26:01 +01:00 |
|
|
kevinz000
|
b2235e03a7
|
Merge pull request #11372 from Ghommie/Ghommie-cit610
Of runtimes and null.
|
2020-03-08 11:10:02 -07:00 |
|
|
kevinz000
|
2b99f729e6
|
Merge pull request #11384 from Citadel-Station-13/Ghommie-patch-3
I forgot to delete a line on the (now working) PDA overlays fix.
|
2020-03-08 11:09:17 -07:00 |
|
|
kevinz000
|
c736568a5a
|
Merge pull request #11369 from Ghommie/Ghommie-cit609
Porting the musician and curator beacons.
|
2020-03-08 07:34:48 -07:00 |
|
|
Ghom
|
57ba56d3bc
|
Update handcuffs.dm
|
2020-03-08 14:09:59 +01:00 |
|
|
Ghom
|
d25ec08da8
|
Update PDA.dm
|
2020-03-08 07:13:08 +01:00 |
|
|
Ghommie
|
10c8dbbb6e
|
hOLd oN
|
2020-03-08 02:47:38 +01:00 |
|
|
Ghommie
|
e23e478c06
|
mOre rUntIMeS
|
2020-03-08 02:43:35 +01:00 |
|
|
Ghommie
|
5bcb38c79f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit610
|
2020-03-08 02:33:27 +01:00 |
|
|
Ghom
|
3e9b998866
|
Merge pull request #11360 from Citadel-Station-13/kevinz000-patch-23
Stunbaton disarm mode also works on disarm intent now
|
2020-03-08 01:39:53 +01:00 |
|
|
Ghommie
|
97315940fe
|
Polychromic element.
|
2020-03-08 01:01:21 +01:00 |
|
|
kevinz000
|
7115c96f9d
|
Merge branch 'master' into gc_debugging
|
2020-03-07 15:30:47 -08:00 |
|
|
Kraseo
|
bbf43b0464
|
whoopsies almost forgot this
|
2020-03-07 20:48:04 +01:00 |
|
|
Kraseo
|
a5ef41c0fc
|
adjust numbers, fix shuttle dropoffs
|
2020-03-07 20:31:49 +01:00 |
|
|
kevinz000
|
02a488f507
|
Merge pull request #11340 from Ghommie/Ghommie-cit605
Porting movespeed modifiers code updates.
|
2020-03-07 03:26:48 -07:00 |
|
|
Ghommie
|
7bed0d5c87
|
Of runtimes and null.
|
2020-03-07 01:57:15 +01:00 |
|
|
Ghommie
|
a817bd6115
|
Porting the musician and curator beacons.
|
2020-03-07 00:12:50 +01:00 |
|
|
kevinz000
|
a669e87db1
|
Merge branch 'master' into gc_debugging
|
2020-03-06 10:14:19 -07:00 |
|
|
kevinz000
|
93d995eb18
|
k
|
2020-03-06 10:13:11 -07:00 |
|
|
Ghom
|
c6c676ceb5
|
Merge pull request #11298 from Kraseo/contracties
Ports TG's Syndicate Contractors
|
2020-03-06 15:23:30 +01:00 |
|
|
kevinz000
|
c2822dd885
|
Update stunbaton.dm
|
2020-03-06 07:23:29 -07:00 |
|