shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,380 Commits 5 Branches 0 Tags
ad20fb1a0e7ae1454ce17b62eb1fbd7d335efd2f
Commit Graph
31380 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kraseo ad20fb1a0e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-06 11:58:11 +01:00
kevinz000andGitHub 0a68143a3e Merge pull request #11297 from Ghommie/Ghommie-cit597 
some dozens lines about some update_overlays issues and cryopods/MMIs.
 2020-03-06 00:20:54 -07:00
CitadelStationBot 1289f628b8 Automatic changelog generation for PR #11306 [ci skip] 2020-03-06 01:20:39 -06:00
kevinz000andGitHub 29727b2fc9 Merge pull request #11306 from Ghommie/Ghommie-cit598 
Removes makeshift switchblades
 2020-03-06 00:20:36 -07:00
kevinz000andGitHub ae97cec8b4 Merge pull request #11309 from Citadel-Station-13/Ghommie-patch-1 
The lavaland elite tumor shard revival now fetches the mob's ghost.
 2020-03-06 00:20:18 -07:00
kevinz000andGitHub d376b99af6 Merge pull request #11315 from Citadel-Station-13/Ghommie-patch-3-2 
Fixing a little issue with the Holodeck's Kobayashi Maru phaser
 2020-03-06 00:19:51 -07:00
CitadelStationBot 61121abc69 Automatic changelog generation for PR #11316 [ci skip] 2020-03-06 01:19:29 -06:00
kevinz000andGitHub 5ebf8ef1e3 Merge pull request #11316 from Citadel-Station-13/Ghommie-patch-3 
Makes cargo passive point generation 125 a minute and not 2 or so every tick.
 2020-03-06 00:19:26 -07:00
kevinz000andGitHub f1d9725bd8 Merge pull request #11319 from Ghommie/Ghommie-cit599 
Fixes and improves RCL sprite update procs.
 2020-03-06 00:17:53 -07:00
CitadelStationBot 9d12480aa5 Automatic changelog generation for PR #11323 [ci skip] 2020-03-06 01:17:25 -06:00
kevinz000andGitHub 16d6ba9e21 Merge pull request #11323 from Ghommie/Ghommie-cit600 
Porting a couple material datums code updates and fixes.
 2020-03-06 00:17:21 -07:00
CitadelStationBot ed59161bb4 Automatic changelog generation for PR #11324 [ci skip] 2020-03-06 01:17:12 -06:00
kevinz000andGitHub 23fa750e31 Merge pull request #11324 from Trilbyspaceclone/patch-302 
Makes medical hardsuits have built in huds
 2020-03-06 00:17:09 -07:00
CitadelStationBot 5aaca75106 Automatic changelog generation for PR #11330 [ci skip] 2020-03-06 01:14:45 -06:00
kevinz000andGitHub 78b1dcaae4 Merge pull request #11330 from Citadel-Station-13/Ghommie-patch-4 
Allows blobbernauts to drag objects (but not mobs) again.
 2020-03-06 00:14:43 -07:00
kevinz000andGitHub dac74ccf2d Merge pull request #11331 from Ghommie/Ghommie-cit602 
Fixing one hell of a gibs runtime.
 2020-03-06 00:14:28 -07:00
kevinz000andGitHub 9420424c8f Merge pull request #11332 from Ghommie/Ghommie-cit603 
Replaces EXCEPTION() with stack_trace() and CRASH()
 2020-03-06 00:14:13 -07:00
CitadelStationBot 5250fa1db1 Automatic changelog generation for PR #10451 [ci skip] 2020-03-05 19:03:59 -06:00
deathride58andGitHub 2e35c09dec Merge pull request #10451 from kevinz000/mobility_flags 
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
 2020-03-05 20:03:56 -05:00
CitadelStationBot 3214fc18c1 Automatic changelog generation for PR #11064 [ci skip] 2020-03-05 18:25:05 -06:00
GhomandGitHub 5e603c1cce Merge pull request #11064 from Trilbyspaceclone/more_implants 
3 new arm tool set implants
 2020-03-06 01:25:02 +01:00
CitadelStationBot 524ecae0f0 Automatic changelog generation for PR #11328 [ci skip] 2020-03-05 18:21:11 -06:00
GhomandGitHub 44a9add328 Merge pull request #11328 from Trilbyspaceclone/Hey-Teens! 
Removed unused techweb var - Cargo selling of Techwebs nodes
 2020-03-06 01:21:09 +01:00
CitadelStationBot 6d91a5da7a Automatic changelog generation for PR #11325 [ci skip] 2020-03-05 18:20:50 -06:00
GhomandGitHub dfdf419701 Merge pull request #11325 from Putnam3145/flavor-suck 
Removed some bad flavor objectives.
 2020-03-06 01:20:47 +01:00
CitadelStationBot 516e44a65c Automatic changelog generation for PR #11333 [ci skip] 2020-03-05 04:43:58 -06:00
nik707andGitHub c5b0969842 Merge pull request #11333 from MrJWhit/kilo-station-fixes 
Updates to kilostation
 2020-03-05 04:43:55 -06:00
kevinz000 5bca5690c4 ok 2020-03-05 01:00:35 -07:00
MrJWhit bc7782dcc7 Updates to kilostation 
asdf
 2020-03-04 20:21:25 -05:00
Ghommie bb7bfc04cc Replaces EXCEPTION() with stack_trace() and CRASH() 2020-03-05 01:47:04 +01:00
Ghommie d4af57b0a9 Fixing one hell of a gibs runtime. 2020-03-05 01:02:54 +01:00
kevinz000 b718e0e0d6 fuck 2020-03-04 16:46:09 -07:00
CitadelStationBot dbfd2eb183 Automatic changelog generation for PR #11218 [ci skip] 2020-03-04 17:26:15 -06:00
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
CitadelStationBot 08b26b0e59 Automatic changelog generation for PR #11181 [ci skip] 2020-03-04 16:50:01 -06: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
CitadelStationBot 3a5661ad8a Automatic changelog generation for PR #11318 [ci skip] 2020-03-04 16:40:57 -06: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 9eedf8c1fb Update blob_mobs.dm 2020-03-04 23:34:59 +01:00
CitadelStationBot c0303c2a46 Automatic changelog generation for PR #11327 [ci skip] 2020-03-04 16:17:03 -06:00
GhomandGitHub ec5449b349 Merge pull request #11327 from Arturlang/dropper_fix 
Fixes reagent containers transfer cycling
 2020-03-04 23:17:00 +01:00
GhomandGitHub 17488480b1 Allows blobbernauts to drag objects (but not mobs) again. 2020-03-04 22:43:30 +01:00
TrilbySpaceClone 7e51cf9ab3 Removed unused techweb var 2020-03-04 16:30:10 -05:00
Artur f879316b4e All it lacked is a return. 2020-03-04 23:29:08 +02:00
CitadelStationBot c1dadec519 Automatic changelog generation for PR #11310 [ci skip] 2020-03-04 13:29:16 -06: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
Putnam 36e37feae8 Removed some bad flavor objectives. 2020-03-04 11:23:53 -08:00
TrilbyspacecloneandGitHub 1c310f6cee Update hardsuit.dm 2020-03-04 13:01:25 -05:00
CitadelStationBot 733cdd1c40 Automatic changelog generation for PR #11277 [ci skip] 2020-03-04 10:11:42 -06:00