Commit Graph

24746 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
CitadelStationBot
432a7dba5d Automatic changelog generation for PR #9198 [ci skip] 2019-10-23 01:11:58 -05: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
kevinz000
eb8f7de3cc Merge pull request #9583 from BlackMajor/Yeet
My shuttle PR got merged before I could push the latest changes so speedmerge this I guess.
2019-10-22 22:46:00 -07:00
BlackMajor
bc54b619d2 Update some things for consistency 2019-10-23 18:16:52 +13: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
CitadelStationBot
e1c30c2b5e Automatic changelog generation for PR #9561 [ci skip] 2019-10-22 16:49: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
CitadelStationBot
874181a1da Automatic changelog generation for PR #9565 [ci skip] 2019-10-22 16:48:12 -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
CitadelStationBot
e3a840a8c4 Automatic changelog generation for PR #9566 [ci skip] 2019-10-22 16:47:55 -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
CitadelStationBot
6f07fc072b Automatic changelog generation for PR #9551 [ci skip] 2019-10-22 04:28:58 -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
CitadelStationBot
61441f84ca Automatic changelog generation for PR #9556 [ci skip] 2019-10-22 04:27:11 -05: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
CitadelStationBot
58f5f889ff Automatic changelog generation for PR #9534 [ci skip] 2019-10-21 21:30:10 -05:00
deathride58
a7de466a01 Merge pull request #9534 from Linzolle/abductor-science-man
URGENT fixes for abductors
2019-10-21 22:30:07 -04:00
CitadelStationBot
3d1363a8e6 Automatic changelog generation for PR #9246 [ci skip] 2019-10-21 20:19:07 -05: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
CitadelStationBot
2646aa4c6c Automatic changelog generation for PR #9214 [ci skip] 2019-10-21 20:17:59 -05: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
CitadelStationBot
f372837fb8 Automatic changelog generation for PR #9540 [ci skip] 2019-10-21 19:36:48 -05: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
1d649c27de Update robot_movement.dm 2019-10-21 14:38:38 -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
CitadelStationBot
ffa98e9da9 Automatic changelog generation for PR #9536 [ci skip] 2019-10-21 13:16:59 -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
CitadelStationBot
7ba8b55942 Automatic changelog generation for PR #9524 [ci skip] 2019-10-21 10:57:48 -05:00
nik707
8090d58baf Merge pull request #9524 from Linzolle/wingcolors
Colorable decorative wings
2019-10-21 10:57:45 -05:00
CitadelStationBot
3940128897 Automatic changelog generation for PR #9525 [ci skip] 2019-10-21 10:26:55 -05:00
nik707
6a9d8f1981 Merge pull request #9525 from Linzolle/angel-wings
Fix decorative angel wings icon
2019-10-21 10:26:53 -05:00
nik707
ba90df997f Merge branch 'master' into wingcolors 2019-10-21 10:25:46 -05:00
CitadelStationBot
d1b8dc58d2 Automatic changelog generation for PR #9520 [ci skip] 2019-10-21 10:24:32 -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