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

21973 Commits

Author SHA1 Message Date
kevinz000
5bf5796fac Merge pull request #12086 from Citadel-Station-13/Ghommie-patch-3 
Webedit bugfixes
 2020-05-02 15:56:22 -07:00
kevinz000
b68f1aaf72 Merge pull request #12084 from Ghommie/Ghommie-cit717 
Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS.
 2020-05-02 15:55:19 -07:00
kevinz000
3cb4ef24ba Merge pull request #12081 from Ghommie/Ghommie-cit716 
Fixing some runtimes with kevinz skills and holodeck hotspots.
 2020-05-02 15:55:10 -07:00
kevinz000
fe938c500e Merge pull request #12079 from Ghommie/Ghommie-cit715 
Fixing several reported issues.
 2020-05-02 15:54:32 -07:00
kevinz000
ae695aeebd Merge pull request #12074 from Sishen1542/bramch 
makes traitor chap cult items minimum 20 pop
 2020-05-02 15:54:12 -07:00
Lin
f659c036ef Merge pull request #12036 from kevinz000/electrochromatic_windows 
Electrochromatic (dim-on-demand) windows
 2020-05-02 19:13:29 +00:00
Ghommie
42d7d57ad6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit698 2020-05-02 19:17:48 +02:00
Ghommie
7ae2615f51 Whops. 2020-05-02 19:13:21 +02:00
Ghommie
c38c1755cd Done, tested, too many options. 2020-05-02 19:05:41 +02:00
Putnam3145
c1d1e4f0c0 Properly closes some bold tags. (#12088) 
* Fixes some unmatched <b>s

* remember to ctrl+s
 2020-05-02 14:53:17 +02:00
Ghom
8bad031979 Update shields.dm 2020-05-02 01:01:14 +02:00
Ghom
400e2523c2 paint remover issue webedit. 2020-05-02 00:55:18 +02:00
DeltaFire15
21c9c98412 > & < agony (#12082) 
hm yes today a check being the wrong way will break exo nanites.
 2020-05-02 00:36:03 +02:00
Ghommie
b383066e57 Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS. 2020-05-02 00:00:49 +02:00
kevinz000
d678970872 Merge pull request #12068 from zeroisthebiggay/fuckshitasstits 
quick hosion mode buff
 2020-05-01 14:52:50 -07:00
kevinz000
ea831677a1 Merge pull request #11961 from Ghommie/Ghommie-cit697 
toylathe copypasta removal and preparations for economy public lathe nerf.
 2020-05-01 14:52:29 -07:00
Ghommie
f62aaddb1d Fixing some runtimes with kevinz skills and holodeck hotspots. 2020-05-01 23:22:23 +02:00
Ghommie
54e76e8ffb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-05-01 21:49:52 +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
Ghommie
a1f252d558 Fixing several reported issues. 2020-05-01 19:48:27 +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
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
Sishen
37d1c469ea hnmhm cultplain?? 2020-05-01 06:59:54 -06:00
ZeroMan
438a83b5c0 a 2020-04-30 17:56:07 -04: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
kevinz000
9d753fe74f Update damage_procs.dm 2020-04-30 01:07:10 -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
57ab38185f Merge pull request #12014 from Trilbyspaceclone/patch-358 
Buffs shoulder holsters
 2020-04-29 12:00:03 -07: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
ZeroMan
18eb42315e i missed a src 2020-04-28 02:55:25 -04:00
ZeroMan
8dc130175d i actually despise coding 2020-04-28 02:46:46 -04:00