shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,515 Commits 5 Branches 0 Tags
076b6c8699eedc011695de089b1fed13f124300a
Commit Graph

14703 Commits

Author SHA1 Message Date
kevinz000
076b6c8699 Merge pull request #9077 from Sishen1542/id-boingo 
No ID insertion for everything except the hop console
 2019-09-10 22:04:48 -07:00
kevinz000
829a2615c5 Merge pull request #9247 from Thalpy/QuantFix 
Partially fixes tiny runaway decimals in reagents.
 2019-09-10 10:27:40 -07:00
BlackMajor
0b581a1ded Merge branch 'master' into Doggo-sit 2019-09-10 11:02:57 +12:00
BlackMajor
c824f4a6fe Fixes Alina's donor sprites and adjusts dark medihound to not trigger the red cross 2019-09-09 20:38:51 +12:00
nik707
11846849cf Merge pull request #9249 from Trilbyspaceclone/patch-224 
Clean bot now cleans Cumstains, glitter, tiny glass shards and more!
 2019-09-08 19:49:44 -04:00
nik707
bfbf9f2492 Merge pull request #9254 from Citadel-Station-13/gloria-plushie 
Adds Gloria Redwood plushie as well as heichou's plushies.
 2019-09-08 19:47:50 -04:00
kevinz000
7843e070ff Update mob.dm 2019-09-08 12:13:24 -07:00
kevinz000
3e9d37e70d Update plushes.dm 2019-09-07 17:13:21 -07:00
kevinz000
b8374feafd Update plushes.dm 2019-09-07 17:03:06 -07:00
kevinz000
8f577e910a Merge pull request #9238 from Trilbyspaceclone/surgery_stuff 
Adds two more surgerys - Embalming and Body Rejuvenation
 2019-09-07 11:37:13 -07:00
kevinz000
09ed526594 Merge pull request #9089 from Sishen1542/rapid-construction-dabvice 
RCDs can be upgraded to create computer/machine frames, moved deconstruction to the upgrade tier
 2019-09-07 11:35:09 -07:00
kevinz000
0f6828e76e Merge pull request #9224 from kappa-sama/apeserum 
traitor geneticists can now go ape
 2019-09-07 11:27:44 -07:00
kevinz000
c5f3f3d7f9 Merge pull request #9250 from MrJWhit/abductor-spawntext 
Changes Abductor Spawntext
 2019-09-07 11:26:38 -07:00
MrJWhit
97072c63c8 Adds text to not disturb the habatat to abductor spawntext 
Adds "Try not to disturb the habitat, it could lead to dead specimens." to the spawntext.
 2019-09-07 13:52:08 -04:00
kevinz000
87cf0b971a Merge pull request #9221 from Sishen1542/chappy 
adds some new nullrods with some back end null rod refactors
 2019-09-06 16:47:46 -07:00
Trilbyspaceclone
8c05b4a1d8 *poor cleanbot* 2019-09-06 19:20:32 -04:00
Trilbyspaceclone
3c38e6eb3d Update cleanbot.dm 2019-09-06 18:49:42 -04:00
kevinz000
e71dad4ecc Merge pull request #9242 from kappa-sama/bootcult 
cultist boot cultist boot?
 2019-09-06 11:45:56 -07:00
kevinz000
4b0505f691 Merge pull request #9239 from Trilbyspaceclone/patch-222 
Nerfs earths blood stam regen from 30  - > 13
 2019-09-06 11:45:21 -07:00
BlackMajor
3e5a192af0 Updates borg examine to also show what module type they are. 2019-09-06 13:31:01 +12:00
BlackMajor
cca2001ccb Fixes dogborgs not using their deadsprite 2019-09-06 12:29:36 +12:00
Fermi
816ae638a2 [TO_TEST] 2019-09-05 23:19:53 +01:00
Fermi
29e5c1c10a Still some residual chems kicking about..!! 2019-09-05 23:15:30 +01:00
Chayse Ramsay
0cf1415969 [SPEEDMERGE] Glass Machine :b:roke 2019-09-05 16:28:18 +01:00
BlackMajor
fbc2d3c8fe Ports dogborg sprites from RP to main 
Includes sit sprites, rest style verb, changing where sit sprites update in robot update_icons so that eye layers get cut properly when resting, etc.
 2019-09-06 01:23:53 +12:00
nik707
d8dee76d28 Merge pull request #9222 from Citadel-Station-13/kevinz000-patch-80 
TK dusting now uses the proper removal procs to prevent bugs
 2019-09-04 20:14:06 -05:00
kappa-sama
364d05e2b7 paxton going ape 2019-09-04 20:48:46 -04:00
kappa-sama
599634496e paxton told me to do this or else he'd go ape 2019-09-04 20:46:50 -04:00
nik707
586eb56977 Merge pull request #9230 from Ghommie/Ghommie-cit191 
Fixing clockie mass recall that I apparently didn't really fix correctly before.
 2019-09-04 19:45:19 -05:00
kappa-sama
876232c1bc cultist boot cultist boot? 2019-09-04 20:38:51 -04:00
Trilbyspaceclone
dbdaae83b6 Update medicine_reagents.dm 2019-09-04 13:29:58 -04:00
TrilbySpaceClone
084b37ae4e tada 2019-09-04 10:13:32 -04:00
Sishen
d431ee1a20 baseball bat 2019-09-04 03:01:47 -04:00
YakumoChen
807f7f4771 completely removes autoscan as originally intended 2019-09-03 06:03:46 +00:00
YakumoChen
fbcce02f78 still removes autoscan 2019-09-03 05:44:51 +00:00
nik707
44c15897c7 Merge pull request #9209 from Sishen1542/ass-ass-ass 
Adds support for trit, bz, and pluox to the SM
 2019-09-02 18:37:42 -05:00
nik707
2fe5571887 Merge pull request #9212 from dapnee/plasmaglass-tables-spears 
Plasmaglass Tables, Spears, Shards (Take 2)
 2019-09-02 18:37:22 -05:00
nik707
67f4276aab Merge pull request #9104 from Sishen1542/tbaton 
classic & telebaton no longer have attack delay
 2019-09-02 18:35:56 -05:00
nik707
ca8166f940 Merge pull request #9041 from Citadel-Station-13/kevinz000-patch-68 
Buffs cult/clockcult wall explosion_block
 2019-09-02 18:28:05 -05:00
nik707
dd7907c3d7 Merge pull request #9057 from EgoSumStultus/male-AI-vox 
Adds the Male AI vox voice.
 2019-09-02 18:27:03 -05:00
nik707
3ea520d443 Merge pull request #8649 from Ghommie/Ghommie-cit50 
Increases the default space ruin z-level count to 2
 2019-09-02 18:25:30 -05:00
nik707
238faae042 Merge pull request #8919 from Citadel-Station-13/kevinz000-patch-47 
Increases click resolution to 0.5 seconds
 2019-09-02 18:23:34 -05:00
Sishen
3f954f10a7 Update runes.dm 2019-09-02 02:09:59 -04:00
Sishen
0b6eb6e34c Update holy_weapons.dm 2019-09-01 22:36:39 -04:00
Ghommie
4085b479d1 Fixing clockie mass recall that I apparently didn't really fix before. 2019-09-01 01:45:33 +02:00
Sishen
b4f27b8841 allows renaming of non null rod holyweapons, fixes hypertool description 2019-08-31 18:05:09 -04:00
Sishen
279a6ed83e bibles now destroy runes instead of nullrods, due to holy weapons encompassing more typepaths 2019-08-31 17:57:36 -04:00
Sishen
d9fff579b1 damage and stamina balances 2019-08-31 17:39:51 -04:00
nik707
e943cf0ae8 Merge pull request #9219 from Trilbyspaceclone/patch-219 
Ports "Fixes slimes not feeding #44760"
 2019-08-31 02:09:15 -05:00
nik707
c826e1b412 Merge pull request #9175 from lolman360/master 
[READY] Adds durathread jumpskirts, rolled down jumpsuits and PROBABLY FIXES SPRITES
 2019-08-31 02:06:33 -05:00