shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,566 Commits 5 Branches 0 Tags
6b4747d5fed13393c23b020c85111250bbc09c9f
Commit Graph

33566 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MrJWhit 6b4747d5fe Meta station atmos opening up (#12047) 
* Spawning area fix.

Part one of many

* Finishing up atmos

* Haha final fixes

* Security camera update

* Haha whoops, thanks lilly
 2020-05-01 21:26:36 +02:00
kevinz000 f99d904dc7 ports /tg/station vis_flags related fixes (#12064) 
* fixes

* Update layers_planes.dm

* kay
 2020-05-01 21:14:04 +02:00
kevinz000 44f9773ccf Merge pull request #12077 from Ghommie/Ghommie-cit714 
Stops organs from turning against owners in cold environments and freezers.
 2020-05-01 11:50:29 -07:00
MrJWhit 5bdafb78c1 Minor updates to pubby for fixing (#12059) 
* updates to pubby

* Dear justin, double check something BEFORE publishing it
 2020-05-01 18:56:40 +02:00
Putnam3145 3fc4416680 Buffs medbots massively. (#12058) 
* Buffs medbots massively.

* Reverted the previous buff slightly.

* Update code/modules/mob/living/simple_animal/bot/medbot.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-01 18:50:22 +02:00
Psody-Mordheim 030201e5de Two lines (#12071) 2020-05-01 18:42:01 +02:00
kevinz000 269db0c7d6 Identification components + chameleon clothing from uplink is now obfuscated (#12045) 
* fine we'll use components

* syndie kits

* Whew

* examine

* flags

* whew

* compile

* fix

* fix

* ok

* ok

* ok

* done
 2020-05-01 18:39:45 +02:00
BlackMajor d0a3b86d7b Fix wormholes event flinging people into asteroids. (#11946) 
* Update wormholes.dm

* Update code/modules/events/wormholes.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/events/wormholes.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-01 18:27:39 +02:00
MrJWhit 61f6631486 Update engine_sm.dmm (#12062) 2020-05-01 18:26:50 +02:00
Putnam3145 0019b5a742 Game info verb for ghosts (#11935) 
* Some ghost QoL stuff

* DNR/observer only
 2020-05-01 18:02:00 +02:00
Arturlang 16b172c178 Fixes and tweaks for bloodsuckers (#12055) 
* Tweaaakkksss

* Tweaks and stuff

* Compile
 2020-05-01 18:00:15 +02:00
Arturlang 53395171e1 Fixes vendors some (#12056) 2020-05-01 17:59:04 +02:00
kevinz000 2335fd3ca6 kay (#12060) 2020-05-01 17:57:53 +02:00
Ghommie 3715f95650 Stops organs from turning against you in cold environments and freezers. 2020-05-01 16:56:33 +02:00
kevinz000 2f236ffc04 Merge pull request #12048 from zeroisthebiggay/ilowkeydespiseatmospherics 
deautismosifies box station atmospherics
 2020-04-30 15:00:36 -07:00
kevinz000 d2b7c35ec7 Merge pull request #12057 from MrJWhit/fixes-up-singulo-room 
Links up the rad shutters in singulo engine
 2020-04-30 11:13:51 -07:00
ZeroMan 52b7086876 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ilowkeydespiseatmospherics 
# Conflicts:
#	_maps/map_files/BoxStation/BoxStation.dmm
 2020-04-30 13:48:48 -04:00
Lin 7784f5efa1 Merge pull request #12034 from Citadel-Station-13/kevinz000-patch-7 
Maybe fixes vehicles blocking projectiles
 2020-04-30 17:41:07 +00:00
Lin c4250a41d2 Merge pull request #12017 from kevinz000/skills 
Implements a basic skill system + adds surgery skill
 2020-04-30 17:39:21 +00:00
kevinz000 aedecc5f0b Merge pull request #12031 from Trilbyspaceclone/cleanbot 
Cleanbot
 2020-04-30 10:37:37 -07:00
kevinz000 061265981d Merge pull request #12052 from deathride58/fixescheetowalkers 
fixes cheetowalkers by making ashwalkers always spawn with a digitigrade leg type of "digitigrade"
 2020-04-30 10:37:23 -07:00
Ghom 373cafd60b Merge pull request #12063 from Citadel-Station-13/kevinz000-patch-6 
Disables hardmode citadel combat
 2020-04-30 18:20:17 +02:00
kevinz000 e6e2277634 Update damage_procs.dm 2020-04-30 01:07:40 -07:00
kevinz000 9d753fe74f Update damage_procs.dm 2020-04-30 01:07:10 -07:00
kevinz000 a90a246076 Merge pull request #12024 from NopemanMcHalt/digi-justice_trek 
Fixes missing digitigrade sprite for ENT-era command uniform
 2020-04-29 12:03:43 -07:00
kevinz000 1e42f3a3b7 Merge pull request #12023 from Ghommie/Ghommie-cit712 
Fixing riding layers for human/cyborgs.
 2020-04-29 12:03:29 -07:00
kevinz000 d176125c46 Merge pull request #11972 from Trilbyspaceclone/medical-witchcraft 
More Useful Gauze MK II
 2020-04-29 12:02:51 -07:00
kevinz000 830e1b46c8 Merge pull request #12028 from Putnam3145/fix-story-storyteller 
Some more admeme potential for dynamic
 2020-04-29 12:02:21 -07:00
kevinz000 f9f573576e Merge pull request #12038 from Trilbyspaceclone/patch-359 
Corrects vending tackler gloves
 2020-04-29 12:02:00 -07:00
kevinz000 3d116f5e7e Merge pull request #12000 from zeroisthebiggay/comprehensivefucksecuritypr 
Fuck Ranged Security Knockdowns: The Taser Nerf PR That Will Get Me Killed By A Witchhunt
 2020-04-29 12:01:33 -07:00
kevinz000 619609f5ff Merge pull request #12020 from bunny232/master 
Box pool/bar holopads+ scrubbers (that lead to space) in xenobio pens
 2020-04-29 12:01:11 -07:00
kevinz000 18a8f9c607 Merge pull request #12043 from Owai-Seek/sprite-tweaks-4-27-20 
Sprite Updates / Dupe Cleanup
 2020-04-29 12:00:38 -07:00
kevinz000 57ab38185f Merge pull request #12014 from Trilbyspaceclone/patch-358 
Buffs shoulder holsters
 2020-04-29 12:00:03 -07:00
kevinz000 1d12aa5779 Merge pull request #12006 from Trilbyspaceclone/kiloton-of-errors 
Kilo station improvements
 2020-04-29 11:59:26 -07:00
MrJWhit 7831b53932 Links up the rad shutters 2020-04-29 14:03:17 -04:00
Anonymous c1f045c98a Merge remote-tracking branch 'upstream/master' into digi-justice_trek 2020-04-29 13:54:50 +03:00
deathride58 b63cccc38d Merge pull request #12053 from Putnam3145/fix_appendix 
Fix appendices instakilling everyone
 2020-04-29 01:27:06 -04:00
Putnam 2c6ef2f5d1 fix appendices instakilling everyone 2020-04-28 22:14:32 -07:00
deathride58 95c7252d3f fixes cheetowalkers by making ashwalkers always spawn with a digitigrade leg type of "digitigrade" 2020-04-29 00:01:26 -04:00
Lin 19f89ed1ba Merge pull request #12022 from Ghommie/Ghommie-cit711 
organ/on_life tweaks.
 2020-04-29 01:15:02 +00:00
Lin 64a5831a28 Merge pull request #12044 from Citadel-Station-13/kevinz000-patch-2 
Fixes cybernetics not updating slowdowns when dropping shield
 2020-04-29 01:07:55 +00:00
Changelogs bb4bcd4571 Automatic changelog compile [ci skip] 2020-04-29 00:04:18 +00:00
ZeroMan 22d6ac78e1 i actually despise coding 2020-04-28 12:26:33 -04:00
ZeroMan c5107f8fe0 i actually despise coding 2020-04-28 12:25:48 -04:00
ZeroMan 041d7ce4bc i have committed warcrimes 2020-04-28 02:56:38 -04:00
ZeroMan 18eb42315e i missed a src 2020-04-28 02:55:25 -04:00
ZeroMan 40f7472410 i actually despise coding 2020-04-28 02:47:28 -04:00
ZeroMan 8dc130175d i actually despise coding 2020-04-28 02:46:46 -04:00
Lin 50a6128a83 Merge pull request #12032 from Citadel-Station-13/kevinz000-patch-4 
Silicons are now immune to default combat knockdown behavior
 2020-04-27 16:24:49 +00:00
Lin 68bad2ee3f Merge pull request #12033 from Citadel-Station-13/kevinz000-patch-6 
fixes shield bashing working while downed
 2020-04-27 16:24:29 +00:00