Commit Graph
14866 Commits
Author SHA1 Message Date
TrilbyspacecloneandGitHub 8c05b4a1d8 *poor cleanbot* 2019-09-06 19:20:32 -04:00
TrilbyspacecloneandGitHub 3c38e6eb3d Update cleanbot.dm 2019-09-06 18:49:42 -04:00
kevinz000andGitHub e71dad4ecc Merge pull request #9242 from kappa-sama/bootcult
cultist boot cultist boot?
2019-09-06 11:45:56 -07:00
kevinz000andGitHub 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
Sishen dab0829da8 normalizes head roles not rolling the more common antags (wiz is kept) 2019-09-06 04:50:20 -04: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
FermiandFermi 816ae638a2 [TO_TEST] 2019-09-05 23:19:53 +01:00
FermiandFermi 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
Linzolle 5bc6c9ea04 requested change 2019-09-04 21:18:18 -05:00
nik707andGitHub 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-samaandGitHub 364d05e2b7 paxton going ape 2019-09-04 20:48:46 -04:00
kappa-samaandGitHub 599634496e paxton told me to do this or else he'd go ape 2019-09-04 20:46:50 -04:00
nik707andGitHub 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-samaandGitHub 876232c1bc cultist boot cultist boot? 2019-09-04 20:38:51 -04:00
Linzolle f4ed7d04f0 help screen 2019-09-04 14:19:14 -05:00
TrilbyspacecloneandGitHub dbdaae83b6 Update medicine_reagents.dm 2019-09-04 13:29:58 -04:00
AlonefromhellandLinzolle eee1ccbe2c merge oracle ui from kepler 2019-09-04 11:42:04 -05:00
TrilbySpaceClone 084b37ae4e tada 2019-09-04 10:13:32 -04:00
Sishen d431ee1a20 baseball bat 2019-09-04 03:01:47 -04:00
YakumoChenandGitHub 807f7f4771 completely removes autoscan as originally intended 2019-09-03 06:03:46 +00:00
YakumoChenandGitHub fbcce02f78 still removes autoscan 2019-09-03 05:44:51 +00:00
nik707andGitHub 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
nik707andGitHub 2fe5571887 Merge pull request #9212 from dapnee/plasmaglass-tables-spears
Plasmaglass Tables, Spears, Shards (Take 2)
2019-09-02 18:37:22 -05:00
nik707andGitHub 67f4276aab Merge pull request #9104 from Sishen1542/tbaton
classic & telebaton no longer have attack delay
2019-09-02 18:35:56 -05:00
nik707andGitHub 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
nik707andGitHub dd7907c3d7 Merge pull request #9057 from EgoSumStultus/male-AI-vox
Adds the Male AI vox voice.
2019-09-02 18:27:03 -05:00
nik707andGitHub 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
nik707andGitHub 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
TrilbyspacecloneandGitHub 473cde6a9d huh 2019-08-31 21:16:14 -04:00
TrilbySpaceClone c2f189bbdb Merge branch 'master' into fruit 2019-08-31 21:09:59 -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
nik707andGitHub e943cf0ae8 Merge pull request #9219 from Trilbyspaceclone/patch-219
Ports "Fixes slimes not feeding #44760"
2019-08-31 02:09:15 -05:00
nik707andGitHub 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
nik707andGitHub 7e8e32f848 idiot 2019-08-31 02:05:13 -05:00
nik707andGitHub daff8899dd retard 2019-08-31 02:04:58 -05:00
Sishen ba5021af5b gives lasrifle the damage component, turns kevs divine lightblade into a hypereut to balance stats, adds hypertool 2019-08-31 02:55:29 -04:00
nik707andGitHub 1d49765d4e Merge pull request #9218 from Citadel-Station-13/kevinz000-patch-79
improves an exploit patch
2019-08-31 01:48:20 -05:00
nik707andGitHub 01e4e80cca Merge pull request #9216 from Trilbyspaceclone/patch-218
Fixes "Silver Core Luminescents Can Spawn "Oops" #9215"
2019-08-31 01:37:50 -05:00
kappa-samaandGitHub db22ae64d4 im gonna go ape 2019-08-30 22:46:52 -04:00
kevinz000andGitHub 64b29e9e1f Update supermatter.dm 2019-08-30 15:22:58 -07:00
kevinz000andGitHub 975b55e26d Update singularity.dm 2019-08-30 15:19:30 -07:00
kevinz000andGitHub a3917a81b0 Update energy_ball.dm 2019-08-30 15:18:22 -07:00