shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,289 Commits 5 Branches 0 Tags
00adf078b0caed5aa38d50df4e65e793cf72568d
Commit Graph

4095 Commits

Author SHA1 Message Date
SandPoot
00adf078b0 this is needed 2020-11-15 19:13:01 -03:00
SandPoot
cbb44674ac fix + renaming global list? 2020-11-15 19:10:50 -03:00
SandPoot
936bda44db upload gift.dm 2020-11-14 20:38:23 -03: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
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
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
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
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
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
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
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
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
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
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
Putnam3145
d8b39bcc5f Merge pull request #13405 from silicons/tracer 
warp implant is now infinite use and now actually reverts your position to 10 seconds before in time rather than use a snowflake chemical to teleport you 5 seconds later
 2020-10-10 11:02:30 -07:00
The0bserver
e40e4a79d3 Allows plantbags to hold plantdisks 2020-10-10 08:58:54 -04:00
silicons
19f1e99a8c mass ports like 15 tg prs + counting (#13386) 
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-10-10 12:20:33 +02:00
Timothy Teakettle
385bd57940 reworks family heirlooms, adds heirlooms that can be based off your species (#13444) 
* corgi tracker

* better heirloom system

* typo
 2020-10-10 12:15:39 +02:00
The0bserver
98f398338a belt fix and icons 2020-10-09 02:34:42 -04:00
The0bserver
0d1d94fd06 belt 2020-10-09 01:17:46 -04:00
Hatterhat
96e55d6233 the last bit 2020-10-07 17:50:21 -05:00
Hatterhat
9928a172d0 initial commit - sabres 2020-10-06 21:58:59 -05:00
silicons
1b1efce556 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-06 17:11:21 -07:00
silicons
efc4e089c9 Merge pull request #13503 from Hatterhat/glaive-knuckledagger 
survival daggers, luxpod capsule resprite, glaive sprite tweaks soon (tm)
 2020-10-06 17:03:44 -07:00
DeltaFire
06cb91ca3d updates all BODYPART_ORGANIC occurances 
:)
 2020-10-06 18:01:25 +02:00
DeltaFire
4146566af0 hoo boy 
replaces all mentions of bodypart_robotic with is_robotic_limb() where possible, adds BODYPART_HYBRID, adds helpers for organic / robotic limbs (is_robotic_limb() / is_organic_limb(), with a arg to override it accepting hybrid limbs)
Also makes the the surgery to heal robotic limbs work if the torso isn't a robot, but rather if there are robotic bodyparts, makes the IPC brain repair.. only accept IPC brains (obviously), makes the damage threshholds for robo-limbs vars instead of a fix 25 with hybrid ones predefined at 25 / 15 (trigger / mindamage), adds an error message to fixing them if already at theshhold, etc. Now just for replacing BODYPART_ORGANIC with is_organic_limb aswell where applicable.. also actual values for the other robo limbs. Fun!
 2020-10-06 17:34:13 +02:00
Detective-Google
260ed6eff6 fixes arcade carpet 2020-10-05 21:27:42 -05:00
silicons
9faff5ecb6 Merge pull request #13461 from Detective-Google/arcade-carpets 
adds arcade carpets
 2020-10-03 18:07:44 -07:00
silicons
7586c38d52 Merge pull request #13487 from DeltaFire15/borg-KA-upgrade-fix 
Fixes borg KA upgrade installation
 2020-10-03 18:03:11 -07:00
silicons
6a8814cd1e Merge pull request #13484 from DeltaFire15/plushling-fix 
Fixes plushlings
 2020-10-03 14:20:33 -07:00
Hatterhat
4195f96876 glaive daggers squashed 2020-10-03 14:32:19 -05:00
Timothy Teakettle
7726b0456c Merge branch 'master' into cool-ipcs 2020-10-01 21:06:16 +01:00