Commit Graph

15593 Commits

Author SHA1 Message Date
Ghommie
514b023779 kev request: admin ooc is no bigger. 2019-10-25 12:30:05 +02:00
Ghommie
7da46cef75 Ports "All font size spans scale" and cleans up the many browserOutput CSS 2019-10-23 16:41:13 +02:00
kevinz000
e226a79c9b Merge pull request #9198 from Trilbyspaceclone/A_Tailer's_art
Code stuffs + more framework for cargo rework cuz atomic prs are good
2019-10-22 23:11:56 -07:00
nik707
10de9091ec Merge pull request #9558 from Citadel-Station-13/kevinz000-patch-102
fixes soulstones leaving behind abstract invisibility bodies
2019-10-22 16:50:22 -05:00
nik707
afc034d219 Merge pull request #9560 from BlackMajor/Yeet
Updates every arrival and escape shuttle with various changes.
2019-10-22 16:50:09 -05:00
nik707
9a598a92cb Merge pull request #9561 from Ghommie/Ghommie-cit256
Fixing some ayy overlays and client images oddities.
2019-10-22 16:49:07 -05:00
nik707
fc56fd9f8b Merge pull request #9565 from Citadel-Station-13/kevinz000-patch-103
Fixes and nerfs VTEC upgrades
2019-10-22 16:48:10 -05:00
nik707
107bb36253 Merge pull request #9566 from Citadel-Station-13/kevinz000-patch-104
Fixes neurotoxin stunning non-carbons
2019-10-22 16:47:53 -05:00
kevinz000
b9c96715b4 Merge pull request #9551 from Ghommie/Ghommie-cit254
Fixes recycler deleting all clothing for mobs found inside items (e.g bluespace bodybags)
2019-10-22 02:28:56 -07:00
kevinz000
3b0d8cf78b Merge pull request #9556 from Linzolle/paper-fix
Fix not being able to read paper stuck to airlocks, lets AI view paper but with obfuscated text
2019-10-22 02:27:09 -07:00
kevinz000
684658b34f Merge pull request #9559 from Ghommie/Ghommie-cit255
fixes invisible men.
2019-10-22 02:26:34 -07:00
deathride58
a7de466a01 Merge pull request #9534 from Linzolle/abductor-science-man
URGENT fixes for abductors
2019-10-21 22:30:07 -04:00
deathride58
30eafc305c Merge pull request #9246 from Linzolle/taur
[READY] some missing icons + sprite changes for taur suits
2019-10-21 21:19:05 -04:00
deathride58
ee0357b2c4 Merge pull request #9214 from Sishen1542/mechshit
properly ports neovgre from hippie
2019-10-21 21:17:57 -04:00
deathride58
f7cf10853e Merge pull request #8894 from Citadel-Station-13/tgfusion
T G F U S I O N
2019-10-21 21:17:16 -04:00
deathride58
2742c86723 Merge pull request #9072 from Poojawa/gen-poppers
Genpop for security
2019-10-21 21:15:01 -04:00
Trilbyspaceclone
14000502b4 Update recipes_weapon_and_ammo.dm 2019-10-21 21:07:27 -04:00
Trilbyspaceclone
b4b875bf26 Merge branch 'master' into A_Tailer's_art 2019-10-21 21:06:21 -04:00
BlackMajor
cebdc1414f Merge pull request #9540 from YakumoChen/laser-minigone
Reverts #9189 (Laser Minigun)
2019-10-22 13:36:45 +13:00
Trilbyspaceclone
2c72b91fbd Triv curb kick 2019-10-21 19:16:13 -04:00
Trilbyspaceclone
5fced4427b buffs paperwork 2019-10-21 19:05:53 -04:00
BlackMajor
b77a94bd7d Merge pull request #9370 from Citadel-Station-13/kevinz000-patch-88
buffs c4 on mobs
2019-10-22 11:04:30 +13:00
BlackMajor
a2bb6bb07a Merge pull request #9417 from Citadel-Station-13/kevinz000-patch-91
REVS!!
2019-10-22 11:01:20 +13:00
BlackMajor
c901f796f8 Merge pull request #8963 from Citadel-Station-13/kevinz000-patch-61
healing holoparasites now heals toxlovers
2019-10-22 10:50:04 +13:00
kevinz000
69a125d996 Update neurotoxin.dm 2019-10-21 14:41:40 -07:00
kevinz000
c0d4d32dee Update robot_upgrades.dm 2019-10-21 14:36:21 -07:00
Linzolle
32e863ac80 slightly less band-aidy way to do it 2019-10-21 14:12:09 -05:00
kevinz000
cbf7509749 Merge pull request #9536 from r4d6/patch-2
Change the SEVA suit & Exo-suit's descriptions
2019-10-21 11:16:56 -07:00
nik707
ba90df997f Merge branch 'master' into wingcolors 2019-10-21 10:25:46 -05:00
nik707
671fdf32c9 Merge pull request #9520 from r4d6/master
Allow Humans, Felinids, Slimepersons and Lizardpeoples to have Decorative Wings just like Mammals
2019-10-21 10:24:30 -05:00
Ghommie
760522cf6a Fixing some ayy overlays and client images oddities. 2019-10-21 11:29:43 +02:00
BlackMajor
959c4b35ce Update all them shuttles 2019-10-21 22:00:18 +13:00
Ghommie
015789ac45 fixes invisible men. 2019-10-21 10:08:48 +02:00
kevinz000
4a28b7ea2d Merge pull request #9547 from Ghommie/Ghommie-cit250
Fixes silicons being unable to use the teleporter and records consoles from a distance
2019-10-21 01:07:27 -07:00
kevinz000
814f91ee8e Merge pull request #9545 from Ghommie/Ghommie-cit248
Ports "UTTERLY CATASTROPHIC pumpkin meteors will now only happen when it's catastrophic meteor wave, instead of 100% ending the round every time any kind of dust appears"
2019-10-21 01:07:00 -07:00
kevinz000
84c5de29f7 Merge pull request #9537 from Hatterhat/patch-2
Magnetic Pistols Fit In Boots
2019-10-21 01:05:13 -07:00
kevinz000
9e63413911 Merge pull request #9466 from deathride58/yawnborgs
Adds a config option to determine the minimum alert level for secborgs (defaulting to red alert)
2019-10-21 01:04:34 -07:00
kevinz000
838575da50 Merge pull request #9503 from deathride58/tasernerf
Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more
2019-10-21 00:59:58 -07:00
kevinz000
3d24d18622 Update soulstone.dm 2019-10-20 21:27:34 -07:00
Linzolle
6ddd1181a8 paper code is weird rn 2019-10-20 16:53:47 -05:00
Ghommie
ef35aefe4e Fixes recycler deleting all clothing for mobs found inside items (e.g. bluespace bodybags) 2019-10-20 15:41:48 +02:00
Ghommie
12192de0cd also records consoles. 2019-10-20 10:14:50 +02:00
Ghommie
bcd6902f06 Fixes silicons being unable to use the teleporter console from a distance. 2019-10-20 10:08:58 +02:00
Ghommie
964372b047 Ports "UTTERLY CATASTROPHIC pumpkin meteors will now only happen when it's catastrophic meteor wave, instead of 100% ending the round every time any kind of dust appears" 2019-10-20 09:34:16 +02:00
YakumoChen
e39a087dc8 remove beam 2019-10-20 03:09:32 +00:00
YakumoChen
6a5d1c20bd delete minigun 2019-10-20 03:08:20 +00:00
YakumoChen
61bc735ee7 remove gatling laser 2019-10-20 03:07:23 +00:00
YakumoChen
37f58798ab no crafting 2019-10-20 03:05:21 +00:00
kevinz000
659e8edf69 Merge pull request #9522 from Linzolle/tend-wounds
Tend Wounds + Make Revival more accessible
2019-10-19 19:52:21 -07:00
Hatterhat
2a45cd19fb boot holster boot holster 2019-10-19 20:24:00 -05:00