shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,299 Commits 5 Branches 0 Tags
76fe1a77bc07be5b84ee09a53e1c08a2615e4bff
Commit Graph

8945 Commits

Author SHA1 Message Date
DeltaFire 76fe1a77bc Merge remote-tracking branch 'upstream/master' into system-corruption 2020-11-13 01:00:50 +01:00
silicons 0001a2edca Merge pull request #13669 from Arturlang/sacrifice_tweaks 
Makes cult sacrifice not permakill people anymore.
 2020-11-11 11:16:15 -07:00
Artur 8ce058a593 Fixes stupid mistakes 2020-11-09 14:39:51 +02:00
Artur 503d0156c6 Does the thing 2020-11-08 23:24:58 +02:00
silicons 577cd537b3 Merge pull request #13654 from ArchieBeepBoop/giftfix 
Christmas Tree / Jacqueen Gift Blacklist
 2020-11-07 00:32:09 -07:00
silicons 27f53a8af7 Merge pull request #13641 from MrJWhit/combat-knife-nerf 
Nerfs combat knife damage
 2020-11-07 00:29:14 -07:00
silicons ab33acf962 Merge pull request #13602 from Putnam3145/better_dynamic 
Adds a new "minor antag" roundstart to dynamic
 2020-11-07 00:18:51 -07:00
silicons 1a2abc5a2e Merge pull request #13604 from Trilbyspaceclone/welding 
Makes welder code better*
 2020-11-07 00:18:26 -07:00
Dip 3afd604913 remove projectiles 2020-11-04 17:28:23 -03:00
Dip 76e739142b Yeah let's fucking not have jacqueen or the christmas tree spawn runtimes 2020-11-02 16:46:34 -03:00
Timothy Teakettle db87297536 fix (#13632) 2020-11-01 22:03:43 +01:00
DeltaFire15 91584053f5 Fixes a bunch of fallout from the tgui PR (#13648) 
* screamies

fixes a bunch of fallout from the tgui PR.. probably

* Empty commit to poke travis
 2020-11-01 21:59:22 +01:00
DeltaFire feed428510 healthscanner support 
Health scanners now show the type of toxin the target is using (Tox / Corruption)
 2020-11-01 05:10:38 +01:00
Trilbyspaceclone 366a605915 Update weldingtool.dm 2020-10-29 10:53:45 -04:00
MrJWhit 92f31a9a5f Update kitchen.dm 2020-10-28 15:39:51 -04:00
Trilbyspaceclone a837af1436 Update weldingtool.dm 2020-10-28 12:37:50 -04:00
silicons 0307884eab Merge pull request #13627 from Ghommie/Ghommie-cit841 
Here I fix a few issues.
 2020-10-28 07:53:22 -07:00
silicons 6d2028abb5 Merge pull request #13601 from timothyteakettle/critical-item 
antagonistic items will no longer fail to be placed on you
 2020-10-28 07:43:39 -07:00
Ghommie f49f72338f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit841 2020-10-25 15:01:57 +01:00
Ghommie 90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01:00
Trilbyspaceclone bb155f8784 Apply suggestions from code review 
Grammar

Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
 2020-10-24 07:25:27 -04:00
Trilby 8fa595ccea Makes welder code better* 2020-10-21 05:50:41 -04:00
Putnam 7789aeeefc Made minor starts affect full round less; added fallback 2020-10-19 20:28:56 -07:00
Putnam 1738233c27 Adds a new "minor antag" roundtype to dynamic 
with an associated storyteller, even
 2020-10-19 20:20:51 -07:00
Timothy Teakettle 4afceebcc1 critical 2020-10-20 02:11:08 +01:00
Ghommie c0f3317c01 mime/clown masks' face concealment altclick toggle. Plasmaman helmets' welding visors & smileys port. 2020-10-16 20:27:09 +02:00
BlueWildrose 6080253759 Fixes cloning computer UI not updating when pressing certain buttons - also adds extra check for names to update a message (#13549) 
* fixes cloning computer UI not updating when pressing certain buttons

* forgot a few things
 2020-10-15 12:54:22 +02:00
DeltaFire15 1e1a92983a [s] Objective fixes : Cryo edition (#13561) 
* no more free wins from cryo

* Kicks travis with an empty commit

* Update code/game/gamemodes/objective.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-10-15 12:44:08 +02:00
silicons ff46bfda10 Merge pull request #13547 from zeroisthebiggay/crepe 
security fashion power crêpe but it's a sheath for your anime sword
 2020-10-11 17:33:29 -07:00
silicons 29b7b49fe9 Merge pull request #13528 from DeltaFire15/robotic-limbs-PT2 
Robotic limbs 2 : Threshhold Boogaloo
 2020-10-11 17:33:00 -07:00
Tupinambis 3224533a7c Merge branch 'master' into spooder 2020-10-11 14:31:23 -05:00
DeltaFire 4f734f68a9 moves damage checks 
title. Makes it harder to circumvent them.
 2020-10-11 16:18:25 +02:00
DeltaFire a5fce4b6ed Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2 2020-10-11 15:39:41 +02:00
silicons 0c3020d4b8 Merge pull request #13349 from LetterN/git-updates 
Updates git, travis, and build tests
 2020-10-11 01:24:09 -07:00
zerothebigboy ff937e249f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into crepe 2020-10-11 03:14:02 -04:00
BlackMajor 9e909095a8 Merge pull request #13015 from silicons/combat_rework_experimental 
Combat v4: Redesigning Stamina, Sprint, Combat mode
 2020-10-11 18:38:53 +13:00
silicons 7f611a98e1 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-10 22:23:22 -07:00
zerothebigboy 9e04d5723c Merge branch 'crepe' of https://github.com/zeroisthebiggay/Citadel-Station-13 into crepe 2020-10-11 01:20:34 -04:00
zerothebigboy a8315a69e2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into crepe 
# Conflicts:
#	icons/mob/clothing/belt.dmi
#	icons/obj/clothing/belts.dmi
 2020-10-11 01:19:18 -04:00
silicons 283ce51bc2 Merge pull request #13544 from DeltaFire15/portal-wackyness-fix 
Fixes a bunch of portal-related runtimes
 2020-10-10 22:16:49 -07:00
silicons d2ce6ca709 Merge pull request #13540 from TheObserver-sys/QoLPass 
Service+Plumbing QoL Pass 1:  Beakers, Belts, Plungers and Pipes
 2020-10-10 22:04:49 -07:00
silicons c3983ee55b Merge pull request #13535 from Hatterhat/energy-sabres 
[READY] Energy Sabers - an elegant esword skin for a more civilized age
 2020-10-10 22:04:17 -07:00
silicons 8b48cab574 Merge pull request #13233 from Hatterhat/za-hando 
[READY] za hando - a pr about ling claws and punching shit
 2020-10-10 21:59:05 -07:00
zeroisthebiggay 36b1e0b613 uh 
uh
 2020-10-11 00:20:03 -04:00
zerothebigboy ef073167df crepe 2020-10-10 21:39:45 -04:00
DeltaFire 4ccf40f775 Revert "Revert "Merge branch 'master' into robotic-limbs-PT2"" 
This reverts commit 27a099c6bf.
 2020-10-11 00:53:18 +02:00
DeltaFire 27a099c6bf Revert "Merge branch 'master' into robotic-limbs-PT2" 
This reverts commit 73b5267425, reversing
changes made to 2e780bfff2.
 2020-10-11 00:51:39 +02:00
DeltaFire 73b5267425 Merge branch 'master' into robotic-limbs-PT2 2020-10-11 00:44:28 +02:00
DeltaFire 9990337f32 fixes a bunch of portal runtimes 
Ah yes lets just change the basic portal generation proc but not change the actual calls to it for the most part, what could go wrong?!
 2020-10-10 23:40:12 +02:00
silicons ad32b8f437 Merge pull request #13472 from timothyteakettle/slime-puddle 
the pr that lets slimes turn into useless puddles
 2020-10-10 11:14:25 -07:00