kevinz000
|
178aedc5cc
|
Merge pull request #9754 from Ghommie/Ghommie-cit330
porting "global to static"
|
2019-11-14 16:38:27 -07:00 |
|
kevinz000
|
6909857e04
|
Merge pull request #9632 from Ghommie/Ghommie-cit281
Porting multi-z support updates.
|
2019-11-14 15:58:53 -07: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 |
|
kevinz000
|
3015ec5c04
|
Merge pull request #9764 from Ghommie/Ghommie-cit335
Dreamchecker compatibility changes, part 1.
|
2019-11-14 01:37:41 -07: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
|
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 |
|
Ghommie
|
42d9e3cf51
|
Porting Robustin's Syndicate Infiltrator PR
|
2019-11-11 18:49:18 +01:00 |
|
Ghommie
|
1e49ce76d3
|
Dreamchecker compatibility changes, part 1.
|
2019-11-10 20:48:30 +01:00 |
|
Ghommie
|
9591bb5471
|
porting "global to static"
|
2019-11-09 22:53:56 +01:00 |
|
Ghommie
|
a650e1e411
|
Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness"
|
2019-11-05 05:37:28 +01:00 |
|
Ghommie
|
a2f9aaf899
|
Porting "Adjacent Atmos subsystem revival"
|
2019-10-28 17:04:31 +01:00 |
|
Ghommie
|
4aa1d55abb
|
Porting multi-z support updates.
|
2019-10-27 16:32:32 +01:00 |
|
Ghommie
|
a50606bb67
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259
|
2019-10-24 10:10:07 +02:00 |
|
Ghommie
|
e1928a18f1
|
Porting GetComponent macros removal, and some related changes.
|
2019-10-23 15:04:28 +02:00 |
|
Poojawa
|
394c947d14
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-11 23:10:45 -05:00 |
|
kevinz000
|
0643a7b230
|
Merge pull request #9387 from Sishen1542/goose
the geese have been unleased
|
2019-10-11 12:11:50 -07:00 |
|
Poojawa
|
3113074bfb
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-08 02:55:32 -05:00 |
|
Poojawa
|
6d9aa8de70
|
More carpet options and ways to get them
|
2019-10-03 22:54:10 -05:00 |
|
Poojawa
|
b589565398
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-03 15:05:26 -05:00 |
|
Sishen
|
f3d373a6b8
|
loose goose
honk honk
|
2019-10-02 02:27:30 -04:00 |
|
Ghommie
|
2a84162c59
|
incorrect number of macro arguments
|
2019-10-02 00:38:58 +02:00 |
|
Ghommie
|
81fc0c1b32
|
more foolproofing.
|
2019-10-02 00:37:02 +02:00 |
|
Ghommie
|
e635a05d16
|
errors.
|
2019-10-01 23:43:38 +02:00 |
|
Ghommie
|
cfcd325778
|
reworking the shoving people action.
|
2019-10-01 23:13:08 +02:00 |
|
Poojawa
|
f57bdc39a2
|
I still fucking hate components.
|
2019-09-23 02:03:37 -05:00 |
|
Poojawa
|
53895106dc
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-09-13 12:58:02 -05:00 |
|
kevinz000
|
09ed526594
|
Merge pull request #9089 from Sishen1542/rapid-construction-dabvice
RCDs can be upgraded to create computer/machine frames, moved deconstruction to the upgrade tier
|
2019-09-07 11:35:09 -07:00 |
|
nik707
|
ca8166f940
|
Merge pull request #9041 from Citadel-Station-13/kevinz000-patch-68
Buffs cult/clockcult wall explosion_block
|
2019-09-02 18:28:05 -05:00 |
|
Poojawa
|
23333f6ea5
|
reverts the majority of clean act because it doesn't work properly otherwise
|
2019-08-20 23:03:31 -05:00 |
|
Poojawa
|
0290a46ddc
|
Impliments Ghom review, reverts blood list back to component
|
2019-08-15 12:32:44 -05:00 |
|
Sishen
|
dc66446064
|
dab dab
|
2019-08-09 03:19:02 -04:00 |
|
Poojawa
|
283b5d050e
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-08-08 16:51:53 -05:00 |
|
kevinz000
|
df60e21449
|
Update misc_walls.dm
|
2019-08-07 00:20:28 -07:00 |
|
kevinz000
|
8cfba8e2ce
|
Update misc_walls.dm
|
2019-08-03 00:46:24 -07:00 |
|
Poojawa
|
3499d73f6b
|
Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods
|
2019-07-31 19:24:39 -05:00 |
|
Ghommie
|
7b681f4129
|
Fixes jogging on wet tiles actually slipping you if you have less than 20 stamloss.
|
2019-07-28 19:35:53 +02:00 |
|
Ghommie
|
98418c7f87
|
[s] ports "Fixes infinite brass generation exploit"
|
2019-07-04 21:54:20 +02:00 |
|
Ghommie
|
0371a5513a
|
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
|
2019-06-29 06:03:57 +02:00 |
|
BurgerLua
|
1bd0ff5ef1
|
Merge remote-tracking branch 'upstream/master' into RCDMEMES
|
2019-06-10 16:40:10 -07:00 |
|
kevinz000
|
4650e4d353
|
Merge pull request #8557 from Ghommie/Ghommie-cit34
Ports the fix for that stupid z-level edge pull breaking bug.
|
2019-06-08 01:26:17 -07:00 |
|
kevinz000
|
aca85123be
|
Merge pull request #8555 from Ghommie/Ghommie-cit32
Updates radials, makes RCD and RCL use em.
|
2019-06-08 01:25:37 -07:00 |
|
deathride58
|
aa53cc9ea9
|
Merge branch 'master' into fuckatmos
|
2019-06-07 04:38:47 -04:00 |
|
Ghommie
|
f8903a871e
|
Another episode of "fixing that stupid map edge bug again".
|
2019-06-07 04:55:05 +02:00 |
|
Poojawa
|
2e42656b6d
|
Revert "lel"
This reverts commit 9e01a078ec.
|
2019-06-06 19:40:08 -05:00 |
|
Poojawa
|
6b82c985ae
|
Revert "fuckit, I'm just gunna wholesale port from baycode I guess"
This reverts commit 11d10d3805.
|
2019-06-06 19:39:22 -05:00 |
|
Ghommie
|
5a69499927
|
Hol up, unrelated PR time, atomization.
|
2019-06-07 01:32:15 +02:00 |
|
Poojawa
|
11d10d3805
|
fuckit, I'm just gunna wholesale port from baycode I guess
|
2019-06-05 04:55:36 -05:00 |
|
Poojawa
|
9e01a078ec
|
lel
|
2019-06-03 20:06:25 -05:00 |
|