shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,149 Commits 5 Branches 0 Tags
7a2e0892d38fe46eadb18df3aaa9e32a7e80a4d0
Commit Graph

20158 Commits

Author SHA1 Message Date
Ghom
7a2e0892d3 Merge pull request #11277 from kevinz000/sword_point 
En garde! (nah just sword pointing)
 2020-03-04 17:11:39 +01:00
Ghom
6dd27506e1 Merge pull request #11303 from Citadel-Station-13/kevinz000-patch-22 
what the fuck you mean music line too long??
 2020-03-04 17:11:12 +01:00
Ghom
a2fe9f0d23 Update toys.dm 2020-03-04 17:03:26 +01:00
Ghom
0b74bc9da3 Update twohanded.dm 2020-03-04 16:43:57 +01:00
Ghom
7c8b490cb3 Update energy.dm 2020-03-04 16:40:28 +01:00
Ghom
976080d7b2 Merge pull request #11314 from KathrinBailey/Kat-Furniture 
Kat Furniture! New sofas, chess pieces, nine new posters and shower curtain functionality!
 2020-03-04 15:40:01 +01:00
Ghom
8c6b5b49c5 Update contraband.dm 2020-03-04 15:39:23 +01:00
KathrinBailey
11750b4fa9 removed redundant icon line 2020-03-04 14:16:27 +00:00
Ghom
df5b4ab56d Merge pull request #11321 from kevinz000/storage_components_are_bad 
fixes storage closing while dragging, aka "this one line fix that i procrastinated giving a fuck about for about 9 months now"
 2020-03-04 14:31:09 +01:00
kevinz000
f67fa08f0f Merge pull request #11274 from Citadel-Station-13/Ghommie-patch-5 
Fixing a whoopsie with airlocks.
 2020-03-04 05:58:44 -07:00
kevinz000
5e2414bd90 fix 2020-03-03 22:25:35 -07:00
kevinz000
18bdb753d3 bet 2020-03-03 21:13:59 -07:00
kevinz000
0cf7f2e882 Update energy.dm 2020-03-03 21:07:24 -07:00
kevinz000
cbf2355f19 Update code/datums/elements/sword_point.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-03 21:06:05 -07:00
kevinz000
90188c51bf Merge pull request #11308 from Putnam3145/stop-lag 
Removes lag
 2020-03-03 20:28:47 -07:00
KathrinBailey
97733e464d ghommie change and armrest bug fix 2020-03-04 01:35:00 +00:00
Ghom
284ef326c7 Stops ninjas employed by syndies from receiving friendly flavor objectives. 2020-03-04 00:36:18 +01:00
Ghom
62eef87835 Merge pull request #11289 from Trilbyspaceclone/patch-301 
Cotton/Durathreads now stack to 80
 2020-03-03 21:30:14 +01:00
Ghom
0b5481f9b9 Merge pull request #11237 from kevinz000/reagent_logging_3 
reagent logging pr attempt 3 but it works
 2020-03-03 21:27:17 +01:00
KathrinBailey
86790c69a5 credits accidently left out previously 
re-adds nod to CEV Eris for their original sprites.
 2020-03-03 14:38:16 +00:00
KathrinBailey
7e0abda3c1 fixing merge conflicts 
includes trillby's new posters.
 2020-03-03 13:56:01 +00:00
KathrinBailey
83ec1e428c Merge remote-tracking branch 'upstream/master' into Kat-Furniture 2020-03-03 13:48:18 +00:00
KathrinBailey
fe7742637f fixing merge conflicts aaahh 2020-03-03 13:47:58 +00:00
Trilbyspaceclone
d32b6ad7e9 ok 2020-03-03 08:47:17 -05:00
KathrinBailey
a240daaca2 Final changes 
Puts curtain crafting under plastic to stop plastic duping. You can deep rods and cloth, but the cost is 10 plastic sheets and it doesn't drop 10 plastic sheets so it's a loss.
 2020-03-03 13:19:15 +00:00
Ghom
107a6434fd Merge pull request #11305 from Citadel-Station-13/kevinz000-patch-23 
you can no longer stamcrit a goddamn xenomorph come on citadel why is this a thing
 2020-03-03 13:36:52 +01:00
Ghom
f9a2326437 Merge pull request #11203 from Trilbyspaceclone/poster 
Three new posters!
 2020-03-03 13:29:54 +01:00
Ghom
81bb6978de Merge pull request #11250 from Seris02/risingbassnerf 
Rising bass nerfs and fixes
 2020-03-03 13:26:19 +01:00
Ghom
6da3cf3bbb Merge pull request #11299 from Citadel-Station-13/Linzolle-patch-1 
fix flypeople nutrition
 2020-03-03 13:24:32 +01:00
Ghom
294668d6e1 Merge pull request #11300 from kappa-sama/patch-11 
removes obsolete laptop slowdown
 2020-03-03 13:24:15 +01:00
Ghom
c7fe9d31e2 Merge pull request #11311 from Citadel-Station-13/kevinz000-patch-19 
*HELPS* with the atrocious GC situation regarding blobs
 2020-03-03 13:23:28 +01:00
Ghom
3a80d59330 Merge pull request #11312 from Citadel-Station-13/kevinz000-patch-24 
Fixes a bug with garbage collection
 2020-03-03 13:23:12 +01:00
Seris02
8c4c2842d0 fixes and code improvements 2020-03-03 19:27:09 +08:00
kevinz000
c3913a793a Update carbon_movement.dm 2020-03-03 03:02:16 -07:00
kevinz000
81f84f1bd1 Update garbage.dm 2020-03-02 18:18:44 -07:00
kevinz000
49939b0973 Update overmind.dm 2020-03-02 18:15:18 -07:00
Lin
fde24492b9 Merge pull request #11294 from Ghommie/Ghommie-cit596 
An old oversight with disease/var/viable_mobtypes.
 2020-03-02 18:31:25 -06:00
Ghom
c984cd7677 Merge pull request #11270 from ancientpower/paramedic-tweaks 
Paramedic tweaks (sprites/access/stuff for future use)
 2020-03-02 22:46:49 +01:00
Putnam
3cba19dea7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into stop-lag 2020-03-02 11:24:49 -08:00
Putnam
eefba5ce00 Removes lag 2020-03-02 11:24:46 -08:00
kevinz000
6c8154e8e1 Update damage_procs.dm 2020-03-02 12:13:36 -07:00
Ghom
00bc635d27 Merge pull request #11296 from Putnam3145/supermatter-hardcap 
Proper supermatter tweaks
 2020-03-02 16:36:58 +01:00
Ghom
9375113426 Merge pull request #11041 from Arturlang/kills_blood_tomatoe_succ 
Bloodsucker external blood gain rebalancing
 2020-03-02 16:36:22 +01:00
Ghom
782f992c8c Merge pull request #11271 from Citadel-Station-13/kevinz000-patch-19 
Pushing stuff now checks for Process_Spacemove on the automatic step
 2020-03-02 16:34:18 +01:00
Ghom
4ed92ff03a Merge pull request #11283 from Trilbyspaceclone/patch-299 
Makes most winter coats and hoods have their own desc
 2020-03-02 16:18:47 +01:00
Ghom
fca911b74f Merge pull request #11281 from Ragolution/master 
Just another round-end sound.
 2020-03-02 16:17:37 +01:00
kevinz000
1a87a9d051 Update damage_procs.dm 2020-03-02 07:24:02 -07:00
kevinz000
e1f3985309 Update musician.dm 2020-03-02 05:33:48 -07:00
kevinz000
92e95f816a Update defib.dm 2020-03-02 03:49:21 -07:00
kappa-sama
ec3e2ddb24 no more laptop slowdown 2020-03-01 21:17:48 -05:00