kevinz000
|
359790f5af
|
Merge pull request #11876 from Citadel-Station-13/Ghommie-patch-2
Made light bulb/tubes actually use vis_overlays instead of overlays.
|
2020-04-17 05:40:32 -07:00 |
|
kevinz000
|
e84e6bface
|
Merge pull request #11857 from Trilbyspaceclone/race_drinks
Race drinks!
|
2020-04-17 05:20:53 -07:00 |
|
kevinz000
|
61f833b953
|
Merge pull request #11852 from Ghommie/Ghommie-cit681
Custom skin tone preferences.
|
2020-04-17 05:16:04 -07:00 |
|
Trilbyspaceclone
|
6f4a3fc179
|
wine to jello
|
2020-04-16 17:51:03 -04:00 |
|
Ghom
|
10bc1229f9
|
Merge pull request #11734 from Trilbyspaceclone/patch-329
Six new Sci based bounties!
|
2020-04-16 19:06:48 +02:00 |
|
Ghom
|
bceca18626
|
Merge pull request #11839 from Citadel-Station-13/kevinz000-patch-1
you can no longer knock out xenomorphs by punching them in the face i guess
|
2020-04-16 19:04:16 +02:00 |
|
Ghommie
|
2200c690f7
|
configs
|
2020-04-16 18:44:05 +02:00 |
|
Ghom
|
ad6a2b4671
|
Merge pull request #11851 from Citadel-Station-13/kevinz000-patch-4
Contractor kits are now poplocked to 30.
|
2020-04-16 14:46:20 +02:00 |
|
Ghom
|
7cacdb9db7
|
Merge pull request #11879 from Seris02/magboooooooooooots
fixes magboots
|
2020-04-16 14:21:58 +02:00 |
|
Seris02
|
c0ff018bef
|
fixes magboots
|
2020-04-16 16:23:55 +08:00 |
|
Ghom
|
750acd7023
|
Update lighting.dm
|
2020-04-16 05:42:08 +02:00 |
|
Trilbyspaceclone
|
742654b1d2
|
Update alcohol_reagents.dm
|
2020-04-15 10:44:51 -04:00 |
|
UristMcAstronaut
|
ec452de0b2
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-15 08:41:17 +00:00 |
|
Trilbyspaceclone
|
8410d6f35f
|
Why are you like this coffee
|
2020-04-14 19:40:52 -04:00 |
|
TrilbySpaceClone
|
d49210fd48
|
Merge branch 'master' into race_drinks
|
2020-04-14 19:21:47 -04:00 |
|
TrilbySpaceClone
|
a46a6227a9
|
Finally done...
|
2020-04-14 19:11:53 -04:00 |
|
Linzolle
|
d43cb78b8b
|
one more
|
2020-04-14 18:02:51 -05:00 |
|
Linzolle
|
166370fb6c
|
missed one
|
2020-04-14 17:55:22 -05:00 |
|
Linzolle
|
39e6541ccd
|
remove bad words
|
2020-04-14 17:54:07 -05:00 |
|
Linzolle
|
f828f4c4b7
|
Merge remote-tracking branch 'forrest/wewlad' into tos-compliance
|
2020-04-14 17:33:47 -05:00 |
|
Ghommie
|
d84ef22f22
|
I'm amazed this actually works fine.
|
2020-04-14 21:58:37 +02:00 |
|
Lin
|
79f41bc654
|
Merge pull request #11841 from Citadel-Station-13/Ghommie-patch-4
Hardsuit helmet peeve.
|
2020-04-14 18:37:31 +00:00 |
|
Ghommie
|
571584901c
|
Custom skin tone preferences.
|
2020-04-14 19:10:28 +02:00 |
|
UristMcAstronaut
|
ec734475cc
|
Add files via upload
|
2020-04-14 16:21:30 +00:00 |
|
TrilbySpaceClone
|
79a72a50d4
|
this is annoying, why is angel not defind as a race
|
2020-04-14 11:13:49 -04:00 |
|
Ghom
|
49e36e47ff
|
Merge pull request #11809 from kevinz000/storage_rework
Adds baystation-style volumetric space storage support
|
2020-04-14 13:17:11 +02:00 |
|
Ghom
|
5d01e05991
|
Merge pull request #11618 from Arturlang/Garlic
Adds garlic, and tweaks bloodsuckers a bunch.
|
2020-04-14 12:38:34 +02:00 |
|
kevinz000
|
3ec71612e7
|
Update uplink_bundles.dm
|
2020-04-14 01:49:14 -07:00 |
|
kevinz000
|
b10c479d16
|
Merge pull request #11655 from Citadel-Station-13/Ghommie-patch-3
Gives a cooldown to the crusher's vortex talisman trophy.
|
2020-04-14 01:37:36 -07:00 |
|
kevinz000
|
7861b044ea
|
Merge pull request #11826 from Ghommie/Ghommie-cit675
Body size preferences! Oh no!
|
2020-04-14 01:35:46 -07:00 |
|
kevinz000
|
1f900f0e9d
|
Merge pull request #11829 from Citadel-Station-13/Ghommie-patch-5
Fixing a whacky miniature cell duping issue.
|
2020-04-14 01:34:45 -07:00 |
|
kevinz000
|
e271376c4e
|
Merge pull request #11830 from Ghommie/Ghommie-cit676
Fixes the phantom thief component, again
|
2020-04-14 01:34:18 -07:00 |
|
kevinz000
|
2961bf8698
|
Merge pull request #11838 from kappa-sama/gamingtime
makes circuit theft admin only
|
2020-04-14 01:33:06 -07:00 |
|
Artur
|
fb7dc7a54c
|
Fucking icons
|
2020-04-14 09:42:11 +03:00 |
|
Artur
|
356f2913d7
|
Ghommies suggestions and renames a proc
|
2020-04-14 09:30:14 +03:00 |
|
Artur
|
f910a0fd32
|
Conflict fixes
|
2020-04-14 09:27:54 +03:00 |
|
TrilbySpaceClone
|
c5b1324d44
|
sprites and some basic code
|
2020-04-13 19:23:35 -04:00 |
|
Ghommie
|
42ff9b1d35
|
Final test, fixes and parent calls.
|
2020-04-14 01:23:26 +02:00 |
|
Ghommie
|
616d482cf6
|
Deleting poly clothes copypasta.
|
2020-04-13 22:51:46 +02:00 |
|
Ghommie
|
db43f53ac4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
|
2020-04-13 16:15:40 +02:00 |
|
Ghommie
|
0816512150
|
more work.
|
2020-04-13 16:09:52 +02:00 |
|
Ghom
|
5765ceb316
|
Update hardsuit.dm
|
2020-04-13 15:02:01 +02:00 |
|
Ghom
|
873e67f79c
|
Update hardsuit.dm
|
2020-04-13 14:57:47 +02:00 |
|
kevinz000
|
9f2ed092c5
|
Merge pull request #11275 from Citadel-Station-13/Ghommie-patch-6
Reenables the swarmers event.
|
2020-04-13 05:50:24 -07:00 |
|
Ghom
|
dfa58cb517
|
Merge pull request #10986 from Seris02/atomwalkers
wall walking boots for traitors
|
2020-04-13 14:25:43 +02:00 |
|
Ghom
|
6157500f25
|
FYI, Dropped() already handles it.
|
2020-04-13 14:16:48 +02:00 |
|
Seris02
|
468c59bf49
|
oops
|
2020-04-13 20:12:20 +08:00 |
|
kevinz000
|
768909020e
|
Merge pull request #11827 from kiwedespars/nerf
nerfs immortal haste cd
|
2020-04-12 22:35:10 -07:00 |
|
kevinz000
|
105d405d2d
|
Merge pull request #11837 from Ghommie/Ghommie-cit678
Item color removal port fixes.
|
2020-04-12 22:34:45 -07:00 |
|
kevinz000
|
d6544af144
|
Update status_procs.dm
|
2020-04-12 22:25:46 -07:00 |
|