Commit Graph

5391 Commits

Author SHA1 Message Date
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
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
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
deathride58
ee0357b2c4 Merge pull request #9214 from Sishen1542/mechshit
properly ports neovgre from hippie
2019-10-21 21:17:57 -04:00
deathride58
2742c86723 Merge pull request #9072 from Poojawa/gen-poppers
Genpop for security
2019-10-21 21:15:01 -04:00
Trilbyspaceclone
b4b875bf26 Merge branch 'master' into A_Tailer's_art 2019-10-21 21:06:21 -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
kevinz000
c0d4d32dee Update robot_upgrades.dm 2019-10-21 14:36:21 -07:00
Ghommie
760522cf6a Fixing some ayy overlays and client images oddities. 2019-10-21 11:29:43 +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
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
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
TrilbySpaceClone
18c9283d4a Merge branch 'master' into A_Tailer's_art 2019-10-18 00:21:42 -04:00
kevinz000
a6acb212fa Merge pull request #9515 from Ghommie/Ghommie-cit241
Porting "Moves machine/computer frames and structures below object layer." and lowering trays layer.
2019-10-17 17:29:18 -07:00
kevinz000
1d0931ede9 Merge pull request #9505 from Thalpy/Smartdart-QoL
[READY] Tweaks smartdarts with a few quality of life functions, and add a few new things.
2019-10-17 13:23:33 -07:00
kevinz000
1cc4ccee0d Merge pull request #9343 from Linzolle/dissection
port just like a ton of surgery changes from tg also abductor too
2019-10-17 13:13:51 -07:00
kevinz000
033cd3cc53 Merge pull request #9510 from Ghommie/Ghommie-cit240
Fixing tracking implant teleport issues.
2019-10-17 13:05:15 -07:00
kevinz000
d9cb2792e5 Merge pull request #9516 from Ghommie/Ghommie-cit242
Ports "Fixes morgues being able to consume ghosts, AI-eyes, etc."
2019-10-17 13:04:15 -07:00
kevinz000
8be030a931 Merge pull request #9482 from Thalpy/Wiki
Gives chemistry a library (and updates buttons at the top right of the game too).
2019-10-17 13:01:37 -07:00
kevinz000
65841a9485 Merge pull request #9507 from Ghommie/Ghommie-cit238
Ports some in operator misuse bugfixes.
2019-10-17 12:59:44 -07:00
Ghommie
57794421e3 Ports "Fixes morgues being able to consume ghosts, AI-eyes, etc." 2019-10-16 23:57:31 +02:00
Ghommie
f3a9cac11e Porting "Moves machine/computer frames and structures below object layer." and lowering trays layer. 2019-10-16 23:39:21 +02:00
kevinz000
994bfddc1b Merge pull request #9477 from Thalpy/tgOrganFixes
[READY] Fixes a few organ code and lets organs freeze based on ambient temperature.
2019-10-16 12:44:34 -07:00
kevinz000
7187da9e72 Merge pull request #9456 from Thalpy/Spookytime
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
2019-10-15 23:11:35 -07:00
kevinz000
ae19dd16d8 Merge pull request #9486 from ZeroNetAlpha/Janiborg-noms
Borgs are now consumable by scrub pups.
2019-10-15 22:59:20 -07:00
Ghommie
e8b777f162 typo fixes 2019-10-16 05:10:44 +02:00
Ghommie
80ba44e5a2 Smells like work in progress 2019-10-15 22:03:38 +02:00
Ghommie
32013f2aeb More whacky situations. 2019-10-15 21:59:27 +02:00
Ghommie
839f324c99 I need a code quality test. 2019-10-15 21:39:13 +02:00
Ghommie
7e3a812460 Fixing tracking implant teleport issues. 2019-10-15 21:32:01 +02:00
Thalpy
acc0ff8a17 Adds craftable extended mags 2019-10-15 12:37:35 +01:00
Thalpy
e71a70f406 Adds medolier + bag antics 2019-10-15 11:40:07 +01:00
deathride58
26d4a2d943 Merge pull request #9493 from Ghommie/Ghommie-cit234
SDGF ghost poll message made terse, other tweaks.
2019-10-15 06:27:58 -04:00
deathride58
50c27df28f Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more 2019-10-15 03:48:44 -04:00
Ghommie
0cb433ba99 Ports some in operator misuse bugfixes. 2019-10-15 00:26:13 +02:00
Fermi
7b2c8e58ff Fixes freezing and ghost rider 2019-10-14 13:23:39 +01:00
Ghommie
321c30cf89 now with 51% more loads. 2019-10-14 06:24:54 +02:00
Ghommie
3671755142 My cat resting on my neck is just sooo warm, like a best scarf. 2019-10-14 06:06:25 +02:00
Ghommie
e969e89ce5 Well, byond quirks. 2019-10-14 03:09:15 +02:00
Ghommie
22fc7a9088 Resprites bedsheet bins in 3/4 perspective, adds towel bins subtype. 2019-10-14 02:32:23 +02:00
kevinz000
1fda4deef7 Merge pull request #9465 from Trilbyspaceclone/patch-230
Update granters.dm
2019-10-13 13:58:03 -07:00
kevinz000
53858e1818 Merge pull request #9416 from Ghommie/Ghommie-cit215
The niche singularity beacon now also moderately buffs meteor waves.
2019-10-13 13:56:03 -07:00
Zna12
18f10afcd7 Borgs are now consumable by scrub pups. 2019-10-13 15:23:50 -05:00
Thalpy
150b20103e Random tab 2019-10-13 16:39:37 +01:00
Thalpy
7b27d9bd24 Library time 2019-10-13 16:19:32 +01:00
Ghommie
7b65343f45 z-level checks. 2019-10-13 06:04:57 +02:00
Thalpy
3abbfffdb8 Argh 2019-10-12 13:20:39 +01:00