 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 |
|
|
kevinz000
|
06ae6cde09
|
Update code/datums/weather/weather_types/radiation_storm.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-11-14 01:39:42 -07: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 |
|
|
kevinz000
|
3015ec5c04
|
Merge pull request #9764 from Ghommie/Ghommie-cit335
Dreamchecker compatibility changes, part 1.
|
2019-11-14 01:37:41 -07:00 |
|
|
BlackMajor
|
0c33757b14
|
Fixes a few bugs
|
2019-11-14 18:54:57 +13:00 |
|
|
BlackMajor
|
ce94da9ed3
|
Merge branch 'master' into Yote
|
2019-11-14 17:37:57 +13:00 |
|
|
BlackMajor
|
b9a7685830
|
Adds dogborg catch for doggos and some
|
2019-11-14 17:14:14 +13:00 |
|
|
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 |
|
|
Ghommie
|
a7b6443217
|
typo.
|
2019-11-14 03:20:43 +01:00 |
|
|
Ghommie
|
b48ddb99fc
|
Uplink items are now automatically sorted alphabetically. Fixed categories.
|
2019-11-14 02:56:26 +01: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
|
3ce4ef8e27
|
f
|
2019-11-13 21:17:40 +01:00 |
|
|
Ghommie
|
cef72b93eb
|
The files.
|
2019-11-13 20:35:21 +01:00 |
|
|
Ghommie
|
248586cfd7
|
Unmodularize bikehorns and holy weapons.
|
2019-11-13 20:28:19 +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 |
|
|
kevinz000
|
690d6f90ec
|
Update radiation_storm.dm
|
2019-11-12 23:50:40 -07:00 |
|
|
kevinz000
|
53bfbacbe0
|
Update radiation_storm.dm
|
2019-11-12 23:48:39 -07:00 |
|
|
kevinz000
|
d858bd0526
|
Update radiation_storm.dm
|
2019-11-12 23:45:47 -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 |
|