cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-23 07:52:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,514 Commits 29 Branches 2 Tags
093fcfb7212d033affc85177d22c8b9507f98ea2
Commit Graph

5236 Commits

Author SHA1 Message Date
Chinsky
093fcfb721 Wizard: Hugbox Edition. 
Removed Ei Nath and mass gun spawn.
 2013-02-06 19:58:53 +04:00
Ater Ignis
e44f84b526 fixing robolimbs - that was here some time ago, but removed with update 2013-02-06 15:15:31 +04:00
Ater Ignis
1d291fff11 load alien whitelist on startup, all races available if not using WL 2013-02-06 13:35:01 +04:00
Ater Ignis
a8d38c5b76 iv drip taking blood can't be just syringe copypaste - stupid having 50 different blood-datums of 4 in volume 2013-02-06 13:28:21 +04:00
Cael Aislinn
57703df2f9 Merge pull request #2261 from comma/master 
Fixes
 2013-02-06 01:02:27 -08:00
Chinsky
f4b08b0923 Made adminlog messages not visible to mods again. 
Return of attacklog spam (now toggleable)
 2013-02-06 06:14:31 +04:00
Chinsky
c0ce1bef8e SHUT UP VENDOMAT NO I DO NOT WANT THAT CANDY BAR 2013-02-06 01:01:57 +04:00
Chinsky
55479a7b99 'Only in effect if can_hold is not set' my ass. 
Fixed belts stil not accepting batons and tasers.
 2013-02-06 00:49:44 +04:00
Zuhayr
027955d3d2 Fixed invisible Ripley bug, added line of fluff to posibrain join message, reduced posibrain requirements. 2013-02-06 04:07:32 -08:00
Chinsky
fdb2bd0e76 Fixes issues with stool grabbing. 
Stool children no longer can be taken in hand like papa stool.
Hate this class structure.
 2013-02-05 15:53:53 +04:00
Chinsky
e74cd95fec Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/turfs/turf.dm
	code/modules/clothing/spacesuits/rig.dm
 2013-02-02 23:10:12 +04:00
Chinsky
16bea39176 Fix for #2226, Camera runtimes. 
Also now cameras on 2.1.0.1 is TG compliant!
 2013-02-02 22:46:24 +04:00
Chinsky
c944fd92c2 ported fix for #2051 from master 2013-02-02 22:23:10 +04:00
Chinsky
c4997a34f1 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/modules/mob/new_player/new_player.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
 2013-02-02 20:00:10 +04:00
Chinsky
2023253cac Fixes newly built plating repressurizing rooms. 2013-02-02 19:16:16 +04:00
Cael_Aislinn
06809c3651 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	code/controllers/master_controller.dm
	code/modules/mob/new_player/sprite_accessories.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/setup.dm
	icons/mob/human_face.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-01 23:45:13 +10:00
Cael_Aislinn
05bd27d777 re-enabled air profiling, some tweaks to turf changes to resolve outstanding issues (will be overwritten by master) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-01 23:07:28 +10:00
Cael_Aislinn
a6ae09bccf fix for some zas runtimes, overrepressurisation after sealing breaches, zones not properly restructuring during some breaches 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-01 22:50:34 +10:00
Cael_Aislinn
ae16d81888 fix for blueprint areas randomly disappearing after a while, blueprint areas power not working, blueprint areas lighting being [initially] borked 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-01 22:49:24 +10:00
cib
e54e44d495 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature 
Conflicts:
	code/game/gamemodes/events.dm
 2013-01-31 11:15:32 +01:00
cib
9691e497b1 Event code fixes. 
- Previously base event chance would get applied twice, so instead of e.g. 0.03 chance, a 0.03^2 chance
- Removed unused code
 2013-01-31 11:03:48 +01:00
Chinsky
24cf3c2dd0 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/datums/supplypacks.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
	icons/mob/suit.dmi
	icons/obj/drinks.dmi
 2013-01-30 16:39:00 +04:00
Chinsky
0bcda84eeb Fixed issue with magical wooden table disassembling. 
Generally cleaned up table code.
 2013-01-30 01:31:06 +04:00
Chinsky
d1972efbb8 Can order contraband crates. 
Moved most of 'contraband' out of crate to others.
 2013-01-28 18:07:34 +04:00
Chinsky
458726fd88 Now rest of admin ranks will at least have OOC. 2013-01-28 01:22:58 +04:00
Chinsky
3ceaa7e4d8 Nerfed environmental robusting a bit 2013-01-24 14:49:15 +04:00
Cael_Aislinn
e7c10c44cd made delay round end work after restart timer has started, made delay verb also delay round end 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-24 15:38:23 +10:00
Chinsky
7a66e7e524 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
	code/setup.dm
 2013-01-22 23:46:42 +04:00
Chinsky
7310e4bd06 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 
Conflicts:
	baystation12.dme
	code/modules/reagents/Chemistry-Reagents.dm
	html/changelog.html
 2013-01-22 20:07:10 +04:00
Chinsky
9792a1c983 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/machinery/hydroponics.dm
	code/modules/reagents/Chemistry-Reagents.dm
	html/changelog.html
 2013-01-22 20:05:45 +04:00
Cael_Aislinn
7f05c6fdb3 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/game/jobs/job/captain.dm
	code/game/jobs/job/security.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/mob/living/carbon/human/hud.dm
	html/changelog.html
	icons/obj/items.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-23 01:02:27 +10:00
Cael_Aislinn
104bc8dd98 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/datums/supplypacks.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/security.dm
	code/modules/clothing/spacesuits/rig.dm
	icons/mob/head.dmi
	icons/mob/suit.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-23 00:48:07 +10:00
Cael_Aislinn
fb2b2a1d52 various compile fixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-23 00:43:54 +10:00
Cael_Aislinn
bb5a349fcf Merge branch 'incremental_tg' r5600 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/__HELPERS/global_lists.dm
	code/controllers/master_controller.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/hud.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/job.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/science.dm
	code/game/jobs/job/security.dm
	code/game/machinery/computer/cloning.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/implants/implantnanoaug.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/turfs/turf.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/shoes/miscellaneous.dm
	code/modules/clothing/under/ties.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/silicon/say.dm
	code/modules/mob/mob_defines.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/stamps.dm
	code/modules/projectiles/projectile.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/setup.dm
	config/config.txt
	html/changelog.html
	icons/effects/effects.dmi
	icons/mob/feet.dmi
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/mob/ties.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/ties.dmi
	maps/tgstation.2.1.0.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-23 00:23:37 +10:00
Cael_Aislinn
7932f1f795 removed extraneous line in detectivework/evidence.dm, removed constructing closets from plasteel 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-22 17:56:57 +10:00
Cael_Aislinn
0c2c999f74 money! re-added atms, created account system / accounts database, whole bunch of options for moving money around, some tweaks to spacecash and icons 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-22 17:56:34 +10:00
johnsonmt88@gmail.com
3ac21339c1 You can now make a single camera use multiple networks. 
var/network = string is now var/list/network = list().
I've also added a "network_multi" var which is a string. This is specifically for placing cameras on a map that you want to put on multiple networks. Apparently DM's map maker doesn't support lists, so just type them all in as a string and camera/initialize() will take care of the rest.
Input the networks with commas seperating them, for example: "SS13,RD,Secret,Prison,Ect"

I fixed a few issues while editing the cameras on the map as well.

Both maps:
- Re-added the telescreen in the misc research room that got removed at some point. (Thanks to Ikarrus for pointing this out)
- Any room that had 2 cameras (one for each network) were merged into one camera with the new network lists.
- - Permabrig-hallway (SS13, Prison)
- - Every room in R&D (including robotics) (SS13, RD)
- - The bomb testing range (RD, Toxins)

tgstation.2.1.1.dmm:
- Added a missing wire in engineering-sec (Thanks to SuperSayu for pointing this out)
- Fixed some mis-orientated firelocks. (Thanks to Intigracy for pointing this out)
- - The mining door between cargo and mining
- - The door between the hallway and the engineering lobby

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5596 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-22 01:24:09 +00:00
Cael_Aislinn
bb4be2c86a moved cryo cells to the same layer as tables - this will look weird for stuff on the top tile ('behind' the cry cell) but beakers wont be hidden underneath it when they're ejected any more, fixed typo in escape shuttle, fixed syntax error in new player setup screen 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 19:25:19 +10:00
Cael_Aislinn
66ce65a680 minor tweaks and cleanup with events, readded meteor shower and grid check events, removed most unused event files (left some interesting ones) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 19:15:38 +10:00
Cael_Aislinn
351e6d490c empty guns play a "click" sound 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 18:47:36 +10:00
Cael_Aislinn
632cad1044 observers can become mice, strange ore can be picked up in ore boxes/satchels, crates and closets can be built out of plasteel, changelog update 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 18:47:03 +10:00
giacomand@gmail.com
0b3ed70a2a - Changed the min/max damage of plasma to be less deadly. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5594 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-21 03:42:21 +00:00
Cael_Aislinn
05479bdb96 removed many alt_titles 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 12:07:49 +10:00
ericgfwong@hotmail.com
4d9af5c0a4 Recolored a bunch of objects to make medbay's department colours more clear and consistent. The colours are green/white. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5593 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-21 00:11:48 +00:00
giacomand@gmail.com
2c354562ad - Made flamethrowers use afterattack() instead of /turf/DblClick(). 
- Gave engineer vending machines air alarm electronics.
 - Replaced a magic number with what it is defined by.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5592 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-20 23:10:36 +00:00
Cael_Aislinn
20aa136a08 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	code/game/machinery/hydroponics.dm
	code/modules/reagents/Chemistry-Reagents.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 05:05:17 +10:00
Cael_Aislinn
082af8f638 removed some duplicate events code brought in by mistake during tg port, fixed space ninja spam, renamed 'NSV Exodus' to 'NSS Exodus' 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 04:56:20 +10:00
Cael_Aislinn
3e6283403f cleanup of alt titles handling, made sechuds able to see icons for the real job if players have an alt title, made custom job titles via id computer into alt titles 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-21 04:55:02 +10:00
cib
5c97214b97 Removed an instance of spawning space ninjas I overlooked. This one would cause a space ninja to be spawned on every round, 6 minutes in. 2013-01-20 18:54:29 +01:00
Kortgstation@gmail.com
b0077b3498 Removed nanoaugs, they were unbalanced and never used outside of badmins shitting things up. 
They also added extra checks to

-Everytime a mob attacked (checking for super strength and electric hands)
-Every time a mob was attacked (checking for dermal armour)
-Every time a human was shot (checking for reflex)
-Every time a human breathed (checking for rebreather)
-Every tick of human life (checking for regen)
-Every hud update (checking for radar)

Not to mention just cluttered mob code in general. I know there won't be any noticeable performance increase from this but seeing as they were never going to be finished (I asked Doohl beforehand) and mob code is messy enough as is, I think only good can come of removing the code.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5587 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-20 10:45:20 +00:00