634f916301
Merge pull request #12064 from Fox-McCloud/food-candy-sprites
...
Updates Food and Candy Sprites
2019-08-25 18:33:04 -04:00
4820635a7d
Merge pull request #11957 from FreeStylaLT/enginepicker
...
Adds an Engine Picker to Engineering
2019-08-24 10:49:58 -04:00
ca495b2b9b
Adds Sprites for Some Armalis+Vox Gear & Species-fitting Inhand Icons, etc.
...
Adds sprites for all Vox & Armalis earwear
Adds sprites for Armalis default backpack, nitrogen tank (non-'emergency' back & belt) all breathmask variations
Fixes an issue where Vox Armalis wouldn't be rendered with the proper in-hand icons for their massive noise cannons.
Fixes an issue where you couldn't species-fit earwear.
Fixes an issue where Vox Armalis couldn't wear the 'Vox' breath mask.
2019-08-23 22:14:47 -04:00
e602e4fa30
Updates Food and Candy Sprites
2019-08-23 17:37:38 -04:00
f8c447dbba
Merge pull request #12023 from SteelSlayer/ghost-health-analyzer
...
Health and Cyborg analyzer for ghosts
2019-08-22 19:54:48 -04:00
bf572e70a1
Merge branch 'master' into enginepicker
2019-08-23 01:59:00 +03:00
c2015c6608
THE SWITCHENING
2019-08-18 12:47:02 -05:00
3e7156e263
Ghost health/cyborg analyzer
2019-08-17 10:00:05 -04:00
6fda029db8
conflicts
2019-08-14 14:19:33 +03:00
469dba4067
Minor optimization and comments
2019-08-04 01:02:30 +03:00
2a0a0769b0
spacing and fixes the spam-self-attack exploit with the picker
2019-08-02 18:19:56 +03:00
7153552297
Magic strings to defines, adds a GLOB list for the beacons
2019-08-02 17:40:37 +03:00
e0166fa7be
and fixes the picker emitting the item / mob destruction messages
2019-08-02 16:12:10 +03:00
0bc40f478e
and fixes cancel not working
2019-08-02 16:04:31 +03:00
77ff8394b5
removes a redundant switch
2019-08-02 15:57:44 +03:00
de5b2f7d6e
adds the actual .dm oops
2019-08-02 14:43:26 +03:00
c190c814ad
adds the enginepicker
2019-08-02 14:36:31 +03:00
57c700a814
Sanitize all inputs
2019-07-14 09:35:12 -07:00
742bc62c8b
Merge pull request #11544 from Arkatos1/recharger
...
Rechargers now show their contents and charge status on examine
2019-07-08 20:18:36 +08:00
e000e29b09
rechargers now show their contents and charge status on examine
2019-05-18 19:56:30 +02:00
0f98a95666
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# icons/mob/actions/actions.dmi
# paradise.dme
2019-05-13 22:14:38 +02:00
510c210930
Merge
2019-05-09 17:06:35 +01:00
2618def9a1
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# _maps/map_files/Delta/delta.dmm
# _maps/map_files/MetaStation/MetaStation.v41A.II.dmm
# _maps/map_files/MetaStation/z4.dmm
# _maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
# _maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
# _maps/map_files/RandomZLevels/spacebattle.dmm
# _maps/map_files/cyberiad/cyberiad.dmm
# _maps/map_files/cyberiad/z4.dmm
# _maps/map_files/cyberiad/z6.dmm
# _maps/map_files/generic/z5.dmm
# code/__DEFINES/misc.dm
# code/__HELPERS/unsorted.dm
# code/game/objects/structures/lattice.dm
# code/game/turfs/space/space.dm
# code/modules/mob/mob.dm
# code/modules/ruins/ruin_areas.dm
# paradise.dme
2019-05-08 21:40:35 +02:00
d98eb14a39
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/__DEFINES/misc.dm
# code/modules/mob/living/simple_animal/hostile/hostile.dm
# code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
# code/modules/shuttle/shuttle.dm
# icons/mob/actions/actions.dmi
# paradise.dme
2019-05-04 03:16:38 +02:00
f3fb39b339
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
...
# Conflicts:
# code/__DEFINES/misc.dm
2019-05-04 03:07:36 +02:00
e9d39b0d27
Chameleon overhaul
2019-05-01 20:59:41 +02:00
ba0f6abb02
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/game/objects/items.dm
# code/modules/power/cable.dm
# icons/mob/inhands/items_lefthand.dmi
# icons/mob/inhands/items_righthand.dmi
# icons/obj/lighting.dmi
# paradise.dme
2019-04-30 19:26:17 +02:00
ad2238f496
Merge branch 'master' into lighting
2019-04-30 19:15:58 +02:00
ec790efeaa
SSticker
2019-04-30 16:47:47 +01:00
0b5f0df20f
Merge pull request #11400 from Arkatos1/torch
...
Adds new torch sprites + tweaks
2019-04-30 13:05:33 +08:00
7b57d2e319
fixups
2019-04-29 04:41:31 -04:00
010081bd96
Adds new torch sprites, torch now eminates orange light
2019-04-28 18:14:39 +02:00
d0a077f9d5
Powernet Refactor
2019-04-27 02:06:04 -04:00
4423962a2a
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/controllers/subsystem/mapping.dm
# paradise.dme
2019-04-26 23:07:57 +02:00
e4dd9110ee
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
...
# Conflicts:
# paradise.dme
2019-04-26 22:58:56 +02:00
0034e851a1
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
ccef4d1187
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# icons/mob/actions/actions.dmi
# paradise.dme
2019-04-24 02:55:32 +02:00
0d883a5b88
Darkness handling update
2019-04-23 22:59:00 +02:00
ff78ff1a9c
SScommunications
2019-04-21 20:12:14 +01:00
c878f8e36e
Lavaland code review fixes - also integrates flyswatter and cat toy
2019-04-20 00:24:58 +02:00
cc831667cd
Merge pull request #11081 from Kyep/hijack_limits
...
Syndie Uplink changes (better interface, hijack-only firegrenades)
2019-04-04 09:30:56 +08:00
3bbfcc8755
Cleans up some uplink code for showing descriptions
2019-04-02 20:36:52 +01:00
e6ef2e9bbc
Merge pull request #11151 from Fox-McCloud/suicide-refactor
...
Suicide Refactor
2019-03-29 20:49:18 +08:00
d0ea5ee8b9
Crit Rework Final Submission
2019-03-28 17:28:00 -04:00
814e492a55
Suicide Refactor
2019-03-27 22:54:26 -04:00
46fdd6c466
Fixese Flares not Returning a qdel hint
2019-03-24 19:57:34 -04:00
3559a77d0f
Uplink improvements
2019-03-19 04:35:03 -07:00
277722508a
[Goonchem] Reagent Temperature
2019-03-18 20:06:15 -04:00
c569c70ed6
Fox Changes
2019-03-02 08:53:05 -08:00
3d55a1e109
Added slime_scan()
2019-03-01 09:18:05 -08:00
variableundefined