cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 13:07:46 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 12 Branches 2 Tags
dev-docs-readme
Commit Graph
7135 Commits
Author SHA1 Message Date
Crazy LemonandGitHub 01c41cfb86 Merge pull request #6081 from Markolie/lavaland_megafauna 
Ports Lavaland megafauna
 2017-02-05 00:27:40 -08:00
uraniummeltdown 5f2ef0ef7d mineral floors from TG 
group silent tiles with mineral tiles
add tile recipes
add mineral floor tile stacks and turfs
add ability to weld mineral floor tiles
 2017-02-05 10:46:24 +04:00
uraniummeltdown 7dd342743a added cargo ID skin to agent ID and ID Computer 2017-02-05 09:19:52 +04:00
Fox-McCloud f8602ffef8 last fixes, hopefully 2017-02-04 04:28:42 -05:00
Mark van AlphenandGitHub fe62b212b4 Merge branch 'master' into lavaland_megafauna 2017-02-02 20:17:31 +01:00
Brian McGillivray 23139987a0 Tweak: Mr Chang's vending machine now refillable 
Changed the Mr Chang's vending machine to be able to be refiled with a
new Chinese vending refill canister crate that can be ordered by Cargo.
 2017-02-02 15:49:27 +00:00
Fox McCloudandGitHub 3d587dea5b Merge pull request #6177 from uraniummeltdown/new 
Cyborg Blueprints
 2017-02-02 00:50:33 -05:00
Fox-McCloud 78a2518135 Monkey cube refactor, pre-map 2017-01-31 20:44:52 -05:00
Markolie b55394ace3 Fix resource identifiers 2017-01-31 17:45:46 +01:00
Markolie 2b767bb9c9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/modules/mob/mob_helpers.dm
#	icons/obj/ammo.dmi
#	icons/obj/guns/projectile.dmi
#	icons/obj/storage.dmi
 2017-01-31 17:44:38 +01:00
uraniummeltdown 7259e4ce07 blueprints for engiborgs 2017-01-31 19:22:29 +04:00
KasparoVy 4a9f7f28f7 Traitor Steal Objective now Checks Storage Implants 
Does what it says on the tin. In assessing the completion of a steal
objective, storage implants will now be checked.
 2017-01-31 05:01:23 -05:00
Fox McCloudandGitHub 0874ea7295 Merge pull request #6152 from uraniummeltdown/windowflash 
Window Flashing
 2017-01-31 01:30:39 -05:00
Markolie 063b5728ad Welp, revert glass airlock changes 2017-01-28 23:39:59 +01:00
Markolie f1f0f9358f Construction fixes 2017-01-28 23:28:32 +01:00
Markolie f7f08ae265 Enable construction of glass airlocks 2017-01-28 22:13:32 +01:00
KasparoVy 8be2693798 Minor Tweaks & Fixes 
- Updated the flashlight eye-shine check with the new get_dark_view()
helper proc
- Removed a useless check on the handle_dna() for monkeys
- Increases reliability of the monkeyize() proc and fixes issues where
calling it wouldn't turn a mob into a monkey on the spot.
- Increases readability/maintainability of the get_colourmatrix() and
get_dark_view() procs.
 2017-01-28 00:36:37 -05:00
Fox-McCloud 80587202fe forcemove fixes 2017-01-27 21:03:57 -05:00
Fox-McCloud 9fd8718bc7 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-27 19:31:07 -05:00
Markolie 1d7de41acb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/modules/pooling/pool.dm
 2017-01-27 17:28:14 +01:00
Fox-McCloud 6d3ef6001f drying racks 2017-01-26 23:48:47 -05:00
Fox McCloudandGitHub a1ac4a9ec2 Merge pull request #6231 from Aurorablade/ThePowerOfSalt 
THE POWER OF SALT COMPELS YOU
 2017-01-26 10:52:44 -05:00
Aurorablade 55e58ef471 honk 2017-01-26 10:39:48 -05:00
Fox-McCloud 51bbe8c466 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-26 06:53:18 -05:00
Crazy LemonandGitHub 0e42e416b6 Merge pull request #6176 from Fox-McCloud/reagents-noreact-refactor 
Makes Reagents Holder Process and Refactors NOREACT
 2017-01-26 03:47:30 -08:00
KasparoVy d73413b046 Uses the Disabilities system more correctly 
Allows eyes to track eye-dependent disabilities when removed from the mob.
Farwas and Wolpins are now incurably colourblind (non-genetics based), so going lesser-form and back won't wipe your colourblindness.

Eyes being straight-up deleted (as per how set_species() handles setting up the organs required for the species we're changing to) no longer wipes colourblindness.

Now with more helper procs, less unnecessary commenting, random changes and other cleanliness-related tweaks.
 2017-01-26 04:10:55 -05:00
Mark van AlphenandGitHub d55a2c4b6e Merge branch 'master' into lavaland_megafauna 2017-01-25 18:56:09 +01:00
Crazy LemonandGitHub 15dca8b4aa Merge pull request #6226 from Fox-McCloud/debug-this 
Removes Unused Object
 2017-01-25 04:15:18 -08:00
Aurorablade 29c6a89f45 removes processed bread 2017-01-24 23:24:49 -05:00
Fox-McCloud 36bfee25dc last of the missing stuff, hopefully 2017-01-24 18:33:22 -05:00
Fox-McCloud b1f789e104 fixes a ton of thing 2017-01-24 03:23:16 -05:00
Aurorablade 318c339f11 icons are silly 2017-01-23 18:32:40 -05:00
Aurorablade eb4b320676 fox changes 2017-01-23 18:31:13 -05:00
Fox-McCloud 3e87bd3370 more adjustments and fixes 2017-01-23 05:56:17 -05:00
Fox-McCloud 5c828db250 fixes, comfrey, and aloe 2017-01-23 05:25:42 -05:00
Fox-McCloud 7007f6bbdf Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-23 01:01:09 -05:00
Fox-McCloud dc0710135e more fixes 2017-01-23 00:53:44 -05:00
Fox-McCloud 104bfab759 sprite and code fixes 2017-01-22 23:25:56 -05:00
Aurorablade 64b8200823 changes 2017-01-22 19:42:13 -05:00
Markolie d6276ae978 Tiger's comments 2017-01-22 19:15:26 +01:00
Fox-McCloud 706347fd84 even more work 2017-01-22 08:11:31 -05:00
Aurorablade 1769672037 this icon was a thing.... 2017-01-21 19:37:08 -05:00
Fox-McCloud ea76990b7a Botany Rework 2017-01-21 18:28:03 -05:00
Aurorablade 8f3ea0d5cb blrghh 2017-01-21 08:50:58 -05:00
Aurorablade 559fcebb57 ferp 2017-01-21 08:50:30 -05:00
Aurorablade 0d125c20a0 why do i do this.. 2017-01-21 06:17:06 -05:00
Fox-McCloud 723e87effd Removes Unused Object 2017-01-20 21:50:00 -05:00
Markolie a50a3d59b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/__DEFINES/is_helpers.dm
#	code/_globalvars/lists/objects.dm
#	code/game/machinery/turrets.dm
#	config/example/config.txt
#	goon/browserassets/css/browserOutput.css
#	icons/obj/library.dmi
#	icons/turf/floors.dmi
 2017-01-20 23:43:35 +01:00
Crazy LemonandGitHub 2a209f62cd Merge pull request #5814 from Markolie/ann2 
Announcement refactor
 2017-01-18 19:17:30 -08:00
Crazy LemonandGitHub 37a7484976 Merge pull request #6149 from FlattestGuitar/log-upgrade 
Adds log stacking to admin logs
 2017-01-18 19:13:50 -08:00