cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-26 17:31:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,962 Commits 28 Branches 2 Tags
71ba80cfda74a4ac29fbb35a32c8a7182ab1bed6
Commit Graph

1080 Commits

Author SHA1 Message Date
Evankhell561
af8916732b Remove the snowflake power cells (#12637) 2019-10-27 00:28:29 -04:00
Fox McCloud
5194094d3a Refactors Zone Selection (#12523) 2019-10-08 21:11:09 -04:00
Fox McCloud
86f626c9fd Merge pull request #12498 from Darkmight9/Hand-held-defib-new-sprite 
Gives the handheld defib a new sprite
 2019-10-08 05:22:00 -04:00
Fox McCloud
93fa76bee0 Fixes Blood Types (#12520) 2019-10-07 23:15:54 -04:00
Fox McCloud
bb6cadef7a Health Analyzer Refactor (#12511) 2019-10-07 23:15:09 -04:00
Darkmight9
da2fdc0c03 handheld 2019-10-04 20:10:28 -04:00
Fox McCloud
20c4cf0a08 for-if-I-stand-I-stand-by-his-will-alone 2019-10-03 19:52:03 -04:00
Fox McCloud
d29be05f74 the-figment-that-was-is-now-gone 2019-10-01 19:08:15 -04:00
Fox McCloud
2224229fad Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-30 14:18:33 -04:00
AzuleUtama
4bdfc4c32b Camera bug now lists cameras in alphabetical order (#12427) 2019-09-29 19:13:19 -07:00
Fox McCloud
9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage 
# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm
 2019-09-28 00:16:11 -04:00
farie82
0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Fox McCloud
cb8529cdb8 Makes Xenobiology Simpler. Removes Slimes (#12398) 2019-09-24 16:17:33 -07:00
Fox McCloud
238ea19d09 Merge remote-tracking branch 'upstream/master' into universal-damage 
# Conflicts:
#	code/modules/clothing/suits/labcoat.dm
#	code/modules/clothing/under/miscellaneous.dm
#	code/modules/mob/living/carbon/human/species/golem.dm
#	code/modules/mob/living/simple_animal/bot/ed209bot.dm
 2019-09-21 12:40:07 -04:00
AzuleUtama
09b87516d4 Syndie and Binary keys now use their own sprites (#12347) 2019-09-20 17:59:22 -07:00
Dave
caffb8fd65 Adds Analyzer Examine Hint (#12336) 2019-09-20 17:58:03 -07:00
Fox McCloud
aa49033844 nor-shall-our-souls-falter 2019-09-17 16:06:09 -04:00
Fox McCloud
6f637b6014 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-17 11:24:58 -04:00
Fox McCloud
d9186a0c7b Fixes Double-Bonking Light Replacer 2019-09-15 11:11:07 -04:00
Fox McCloud
af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
Fox McCloud
40428e47d9 Refactors Shards, Improved Light Replacer, Adds Plasmaspear 2019-09-10 03:08:44 -04:00
Fox McCloud
dca6d98f5f Refactors Corgis 2019-09-04 18:40:34 -04:00
variableundefined
634f916301 Merge pull request #12064 from Fox-McCloud/food-candy-sprites 
Updates Food and Candy Sprites
 2019-08-25 18:33:04 -04:00
variableundefined
4820635a7d Merge pull request #11957 from FreeStylaLT/enginepicker 
Adds an Engine Picker to Engineering
 2019-08-24 10:49:58 -04:00
KasparoVy
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
Fox McCloud
e602e4fa30 Updates Food and Candy Sprites 2019-08-23 17:37:38 -04:00
Fox McCloud
f8c447dbba Merge pull request #12023 from SteelSlayer/ghost-health-analyzer 
Health and Cyborg analyzer for ghosts
 2019-08-22 19:54:48 -04:00
FreeStylaLT
bf572e70a1 Merge branch 'master' into enginepicker 2019-08-23 01:59:00 +03:00
Shadow
c2015c6608 THE SWITCHENING 2019-08-18 12:47:02 -05:00
SteelSlayer
3e7156e263 Ghost health/cyborg analyzer 2019-08-17 10:00:05 -04:00
FreeStylaLT
6fda029db8 conflicts 2019-08-14 14:19:33 +03:00
FreeStylaLT
469dba4067 Minor optimization and comments 2019-08-04 01:02:30 +03:00
FreeStylaLT
2a0a0769b0 spacing and fixes the spam-self-attack exploit with the picker 2019-08-02 18:19:56 +03:00
FreeStylaLT
7153552297 Magic strings to defines, adds a GLOB list for the beacons 2019-08-02 17:40:37 +03:00
FreeStylaLT
e0166fa7be and fixes the picker emitting the item / mob destruction messages 2019-08-02 16:12:10 +03:00
FreeStylaLT
0bc40f478e and fixes cancel not working 2019-08-02 16:04:31 +03:00
FreeStylaLT
77ff8394b5 removes a redundant switch 2019-08-02 15:57:44 +03:00
FreeStylaLT
de5b2f7d6e adds the actual .dm oops 2019-08-02 14:43:26 +03:00
FreeStylaLT
c190c814ad adds the enginepicker 2019-08-02 14:36:31 +03:00
tayyyyyyy
57c700a814 Sanitize all inputs 2019-07-14 09:35:12 -07:00
variableundefined
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
Arkatos1
e000e29b09 rechargers now show their contents and charge status on examine 2019-05-18 19:56:30 +02:00
Mark van Alphen
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
AffectedArc07
510c210930 Merge 2019-05-09 17:06:35 +01:00
Mark van Alphen
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
Mark van Alphen
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
Mark van Alphen
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
Mark van Alphen
e9d39b0d27 Chameleon overhaul 2019-05-01 20:59:41 +02:00
Mark van Alphen
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
Mark van Alphen
ad2238f496 Merge branch 'master' into lighting 2019-04-30 19:15:58 +02:00