 CitadelStationBot
|
a4e47df4bb
|
Automatic changelog generation for PR #9689 [ci skip]
|
2019-11-14 16:50:54 -06:00 |
|
|
kevinz000
|
d8e89b235f
|
Merge pull request #9689 from Ghommie/Ghommie-cit307
How many times I have encountered this sort of issue in the past and how much of a meme it was...
|
2019-11-14 15:50:52 -07:00 |
|
|
kevinz000
|
09e5cd95a3
|
Merge pull request #9690 from Ghommie/Ghommie-cit308
Unmodularize configuration, _globalvars and subsystems.
|
2019-11-14 15:50:20 -07:00 |
|
|
CitadelStationBot
|
510c068839
|
Automatic changelog generation for PR #9544 [ci skip]
|
2019-11-14 16:50:02 -06:00 |
|
|
kevinz000
|
45e91e7943
|
Merge pull request #9544 from MrJWhit/brain-damage-change
Changes brain damage lines
|
2019-11-14 15:49:59 -07:00 |
|
|
kevinz000
|
617b0db310
|
Merge pull request #9692 from Ghommie/Ghommie-cit309
Unmodularize cargo console, disposal bin, lighting bulbs/tubes and alien nest ruin.
|
2019-11-14 15:48:34 -07:00 |
|
|
CitadelStationBot
|
d41efa1200
|
Automatic changelog generation for PR #9453 [ci skip]
|
2019-11-14 16:47:21 -06:00 |
|
|
kevinz000
|
af0962088c
|
Merge pull request #9453 from Ghommie/Ghommie-cit226
Mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes.
|
2019-11-14 15:47:18 -07:00 |
|
|
CitadelStationBot
|
c56a303d50
|
Automatic changelog generation for PR #9430 [ci skip]
|
2019-11-14 16:45:02 -06:00 |
|
|
kevinz000
|
dfa2296758
|
Merge pull request #9430 from Ghommie/Ghommie-cit220
Ports "Adds three new .38 ammo types", also lazily adding .357 AP
|
2019-11-14 15:44:59 -07:00 |
|
|
CitadelStationBot
|
f1a2a76f46
|
Automatic changelog generation for PR #9554 [ci skip]
|
2019-11-14 16:43:54 -06:00 |
|
|
kevinz000
|
d1ea2d9990
|
Merge pull request #9554 from NopemanMcHalt/assu
[READY] Desperate Assistance Battleforce
|
2019-11-14 15:43:51 -07:00 |
|
|
CitadelStationBot
|
3d8ebe4219
|
Automatic changelog generation for PR #9775 [ci skip]
|
2019-11-14 02:40:19 -06:00 |
|
|
kevinz000
|
487f98bf68
|
Merge pull request #9775 from Ghommie/Ghommie-cit340
ports "Adds superlube to the clown ruin", "Replaces the slime extract in the clown biodome with a superlube sprayer." and buffs clown PDAs
|
2019-11-14 01:40:16 -07:00 |
|
|
CitadelStationBot
|
106753c069
|
Automatic changelog generation for PR #9791 [ci skip]
|
2019-11-14 02:39:24 -06:00 |
|
|
kevinz000
|
f1612f6619
|
Merge pull request #9791 from kappa-sama/revolverports
ports TG's nicer revolver sprites for russian revolvers, normal .357 revolvers, and golden .357
|
2019-11-14 01:39:21 -07:00 |
|
|
kevinz000
|
e70a76085c
|
Merge pull request #9789 from PersianXerxes/fixReagentDescriptions
Corrects the descriptions of meth and ephedrine
|
2019-11-14 01:38:01 -07:00 |
|
|
CitadelStationBot
|
3e4d6cb30c
|
Automatic changelog generation for PR #9764 [ci skip]
|
2019-11-14 02:37:44 -06:00 |
|
|
kevinz000
|
3015ec5c04
|
Merge pull request #9764 from Ghommie/Ghommie-cit335
Dreamchecker compatibility changes, part 1.
|
2019-11-14 01:37:41 -07:00 |
|
|
BlackMajor
|
30a6df88c6
|
Merge pull request #9807 from BlackMajor/Yeehaw
Fixes Nuclear Operatives being scared to death. (Removes halloween.dm. No more locker ghosts)
|
2019-11-14 20:58:51 +13:00 |
|
|
BlackMajor
|
af9c6279bc
|
Fucking locker ghosts
|
2019-11-14 19:03:34 +13:00 |
|
|
BlackMajor
|
f4861ae808
|
Merge pull request #25 from Citadel-Station-13/master
synch time
|
2019-11-14 17:25:35 +13: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 |
|
|
kappa-sama
|
26281fbc57
|
bye bye modcit
|
2019-11-13 16:56:23 -05:00 |
|
|
kappa-sama
|
c9c7d3e64e
|
begone
|
2019-11-13 16:46:13 -05: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 |
|
|
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 |
|
|
CitadelStationBot
|
aa7d037769
|
Automatic changelog generation for PR #9771 [ci skip]
|
2019-11-13 00:58:49 -06: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 |
|
|
CitadelStationBot
|
8a7393cbe4
|
Automatic changelog generation for PR #9773 [ci skip]
|
2019-11-13 00:58:18 -06: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 |
|
|
CitadelStationBot
|
a12f38d2ef
|
Automatic changelog generation for PR #9765 [ci skip]
|
2019-11-13 00:57:41 -06: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 |
|
|
CitadelStationBot
|
5e38fd4465
|
Automatic changelog generation for PR #9772 [ci skip]
|
2019-11-13 00:56:04 -06: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 |
|
|
CitadelStationBot
|
f520bdef5c
|
Automatic changelog generation for PR #9779 [ci skip]
|
2019-11-13 00:52:04 -06:00 |
|
|
kevinz000
|
2325cf1547
|
Merge pull request #9779 from Ghommie/Ghommie-cit341
A few clock cult improvements.
|
2019-11-12 23:51:58 -07: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 |
|
|
kappa-sama
|
da3164fc10
|
send
help
|
2019-11-12 16:48:28 -05: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 |
|
|
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
|
a18bcd05d7
|
makes it compile.
|
2019-11-12 02:38:45 +01: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 |
|
|
Ghommie
|
29114de3f1
|
The actual waterflower, am I funny yet?
|
2019-11-12 00:47:36 +01:00 |
|
|
Ghommie
|
19a511929d
|
and "Replaces the slime extract in the clown biodome with a superlube sprayer."
|
2019-11-11 23:39:03 +01:00 |
|
|
Ghommie
|
e50c56150e
|
ports "Adds superlube to the clown ruin" and buffs clown PDAs
|
2019-11-11 23:10:22 +01:00 |
|