shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,192 Commits 5 Branches 0 Tags
c5b09698424b6bbff804d97c5012d683047e949b
Commit Graph
20186 Commits
Author SHA1 Message Date
GhomandGitHub 68273d0211 Merge pull request #11218 from Seris02/nomoreailipreading 
no more ai illegal upgrades, version 2 because I forgot I made it in web browser last time
 2020-03-05 00:26:12 +01:00
GhomandGitHub 5e4f8dc6a0 Merge pull request #11181 from Detective-Google/big-chode-energy 
changes sausage girth from circumference -> diameter
 2020-03-04 23:49:58 +01:00
GhomandGitHub d78cdb9b37 Merge pull request #11130 from BlackMajor/SpaceRuins 
Enables space ruin generation in the station z-level. Adds new ruins for the sake of station ruins.
 2020-03-04 23:46:10 +01:00
GhomandGitHub c373323690 Merge pull request #11318 from Citadel-Station-13/Linzolle-patch-1 
fix nose booping
 2020-03-04 23:40:54 +01:00
GhomandGitHub ec5449b349 Merge pull request #11327 from Arturlang/dropper_fix 
Fixes reagent containers transfer cycling
 2020-03-04 23:17:00 +01:00
Artur f879316b4e All it lacked is a return. 2020-03-04 23:29:08 +02:00
LinandGitHub 1a1e362e80 Merge pull request #11310 from Citadel-Station-13/Ghommie-patch-2 
Fixing mob holders inventory slot flags (ergo they are not glasses)
 2020-03-04 13:29:13 -06:00
GhomandGitHub 7a2e0892d3 Merge pull request #11277 from kevinz000/sword_point 
En garde! (nah just sword pointing)
 2020-03-04 17:11:39 +01:00
GhomandGitHub 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
GhomandGitHub a2fe9f0d23 Update toys.dm 2020-03-04 17:03:26 +01:00
GhomandGitHub 0b74bc9da3 Update twohanded.dm 2020-03-04 16:43:57 +01:00
GhomandGitHub 7c8b490cb3 Update energy.dm 2020-03-04 16:40:28 +01:00
GhomandGitHub 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
GhomandGitHub 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
GhomandGitHub 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
kevinz000andGitHub 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
BlackMajor 43e77f7d3a Last few fixes. Adds arcane wand to dead wizard roid. 2020-03-04 19:12:56 +13:00
kevinz000 5e2414bd90 fix 2020-03-03 22:25:35 -07:00
kevinz000andGitHub 18bdb753d3 bet 2020-03-03 21:13:59 -07:00
kevinz000andGitHub 0cf7f2e882 Update energy.dm 2020-03-03 21:07:24 -07:00
kevinz000GitHubGhom
 		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
kevinz000andGitHub 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
GhomandGitHub 284ef326c7 Stops ninjas employed by syndies from receiving friendly flavor objectives. 2020-03-04 00:36:18 +01:00
GhomandGitHub 62eef87835 Merge pull request #11289 from Trilbyspaceclone/patch-301 
Cotton/Durathreads now stack to 80
 2020-03-03 21:30:14 +01:00
GhomandGitHub 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
LinandGitHub 622a060857 use defines 2020-03-03 20:22:57 +00:00
LinandGitHub 6e4a22f4fe fix boop 2020-03-03 20:18:08 +00: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
TrilbyspacecloneandGitHub 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
GhomandGitHub 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
GhomandGitHub f9a2326437 Merge pull request #11203 from Trilbyspaceclone/poster 
Three new posters!
 2020-03-03 13:29:54 +01:00
GhomandGitHub 81bb6978de Merge pull request #11250 from Seris02/risingbassnerf 
Rising bass nerfs and fixes
 2020-03-03 13:26:19 +01:00
GhomandGitHub 6da3cf3bbb Merge pull request #11299 from Citadel-Station-13/Linzolle-patch-1 
fix flypeople nutrition
 2020-03-03 13:24:32 +01:00
GhomandGitHub 294668d6e1 Merge pull request #11300 from kappa-sama/patch-11 
removes obsolete laptop slowdown
 2020-03-03 13:24:15 +01:00
GhomandGitHub 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
GhomandGitHub 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
kevinz000andGitHub c3913a793a Update carbon_movement.dm 2020-03-03 03:02:16 -07:00
kevinz000andGitHub 81f84f1bd1 Update garbage.dm 2020-03-02 18:18:44 -07:00
kevinz000andGitHub 49939b0973 Update overmind.dm 2020-03-02 18:15:18 -07:00
LinandGitHub 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
GhomandGitHub bee392257e Update monkey.dm 2020-03-02 23:02:16 +01:00
GhomandGitHub 99841c9447 Update pai_shell.dm 2020-03-02 23:00:41 +01:00
GhomandGitHub aa1f9a3695 Update _drone.dm 2020-03-02 22:59:00 +01:00