Putnam
ad84b2977a
this might help with the disk weirdness
2019-11-13 19:14:42 -08:00
Putnam
c08c6f5bb7
Made roundstart
2019-11-13 19:13:16 -08:00
Putnam
e88a6f2571
why is this HERE
2019-11-13 19:12:06 -08:00
Putnam
5e51cc63f9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic
2019-11-13 16:58:44 -08:00
Ghommie
2f1a76c21e
Unmodularize keybindings.
2019-11-13 23:57:49 +01:00
Ghommie
2c1740f56e
#43012 and missing typepaths aaaa
2019-11-13 23:26:03 +01:00
kappa-sama
6ad9c7fef0
no shotgun i guess
...
shit guess i gotta add this to traumas too
2019-11-13 17:01:30 -05:00
kappa-sama
17d8998fef
emergent gameplay
2019-11-13 16:58:51 -05:00
Ghommie
aa441fba5d
Ports Improved beach away mission.
2019-11-13 22:52:39 +01:00
Ghommie
29deebbd23
Fixing anti-meta event announcements.
2019-11-13 19:01:11 +01:00
TrilbySpaceClone
73661cfe52
more fixing+ chem selling tweaks
2019-11-13 09:39:42 -05:00
TrilbySpaceClone
de1ce4afc8
more crates and explote fixing
2019-11-13 09:15:44 -05:00
TrilbySpaceClone
ec57e28c17
Merge branch 'master' into Cargo_MKII
2019-11-13 08:00:24 -05:00
Putnam
8a02c1a0a1
Made results of vote semi-public
2019-11-13 04:30:45 -08:00
Putnam
0c3a7d4015
holy shit
2019-11-13 03:49:22 -08:00
Anonymous
837052740a
Merge branch 'master' into assu
...
# Conflicts Resolved:
# icons/mob/head.dmi
# icons/obj/clothing/hats.dmi
2019-11-13 11:59:53 +03:00
Putnam
bbcf91f88c
blacklisted blob from clock cult, latejoin revs now higher req threat
2019-11-12 23:02:59 -08:00
kevinz000
4e3147b228
Merge pull request #9755 from Ghommie/Ghommie-cit331
...
lentext to length, yet another 513 requirement.
2019-11-12 23:59:31 -07:00
kevinz000
18993c735a
Merge pull request #9771 from Ghommie/Ghommie-cit338
...
Porting Robustin's Syndicate Infiltrator PR from tee-gee
2019-11-12 23:58:46 -07:00
kevinz000
e142ed03dd
Merge pull request #9773 from Ghommie/Ghommie-cit339
...
Adding a new PDA reskin, sprites from CEV-Eris (plus bits from Beestation and Cit-RP)
2019-11-12 23:58:15 -07:00
kevinz000
8920930679
Merge pull request #9765 from dapnee/let's-fix-lockers
...
Ports Closet & Crate Initialization Fixes
2019-11-12 23:57:39 -07:00
kevinz000
a16219d97a
Merge pull request #9772 from DeltaFire15/weh
...
Adds eight new plushies to the game while integrating kevs' plush PR
2019-11-12 23:56:01 -07:00
Ghommie
b83f92be0e
Unmodularize airlocks.
2019-11-13 06:50:35 +01:00
Ghommie
f55a602319
Unmodularize areas.
2019-11-13 06:13:18 +01:00
Putnam
89c560c891
this is why static typing is good and should be used more
2019-11-12 17:36:12 -08:00
Putnam
7ea3b5e221
Increased event cooldown
2019-11-12 17:01:25 -08:00
Putnam
6a7453dede
whoops forgot initialize cooldown
2019-11-12 16:48:46 -08:00
Putnam
7a7c410265
lowered admin spam
2019-11-12 16:48:37 -08:00
kappa-sama
1aa1d91b61
Update uplink_items.dm
2019-11-12 17:15:45 -05:00
kappa-sama
f093024967
better guns
2019-11-12 17:04:36 -05:00
Ghommie
4ef1d64356
PR #47500 , #47501 , #47557 , #47588 .
2019-11-12 19:00:45 +01:00
Ghommie
c5a7c28a1b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281
2019-11-12 16:04:05 +01:00
Ghommie
7348693338
chucklefucks.
2019-11-12 15:53:54 +01:00
Ghommie
2b8b8882fb
You are actually rifght, that's bad.
2019-11-12 15:49:20 +01:00
DeltaFire
4d4d495765
Hmm I wonder if anyone would notice if I smuggled another plush into this PR
...
What it says on the tin, got asked via dms to add another plush to my PR so here we go.
Char is Minty.
2019-11-12 15:32:06 +01:00
Putnam
d381be7f07
more logging.
2019-11-12 05:30:08 -08:00
Putnam
82a17d8144
updated an error to actually be right
2019-11-12 03:02:32 -08:00
Persi
b8137cde65
Reducing meteor warning time
2019-11-12 06:02:24 -05:00
Putnam
42d94e6cae
Rethink events (see desc)
...
Made events their own ruletype, made the duplicated-with-different-threats events are now one event with shared values that can scale theirselves up.
Also fixed **MIDROUND ANTAGS NOT WORKING AT ALL BECAUSE THEY WERE LOOKING FOR ENEMIES ONLY AMONG PLAYERS ELIGIBLE FOR THE ANTAG WTF**
2019-11-12 02:57:31 -08:00
Persi
c784cab060
Corrects the descriptions of meth and ephedrine to reflect that their movespeed buffs were previously removed.
2019-11-12 05:37:30 -05:00
Ghommie
9fb70c8af9
Ghommie rants, comment syntax is at stake.
2019-11-12 06:40:30 +01:00
Ghommie
176a757f62
Fixing suit overlays compatibility with items again.
2019-11-12 06:33:06 +01:00
Ghommie
fd33879b33
Fixing some reagent taste descriptions.
2019-11-12 06:20:33 +01:00
Ghommie
e3cdb55a8f
Makes it compile.
2019-11-12 04:45:47 +01:00
Ghommie
aad2b5bcd5
Fixing Aux base camera/drone RCD actions.
2019-11-12 04:35:10 +01:00
Ghommie
a18bcd05d7
makes it compile.
2019-11-12 02:38:45 +01:00
Hatterhat
8d2f833735
stamina hands
2019-11-11 19:14:12 -06:00
Hatterhat
d27150331a
fast hands
2019-11-11 18:59:31 -06:00
Ghommie
0b7437359a
Dynamic.
2019-11-12 01:57:33 +01:00
Ghommie
388a7579b9
A few minor clock cult improvements.
2019-11-12 01:49:36 +01:00
