cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 04:02:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,851 Commits 26 Branches 2 Tags
e79df68ef30b3bc625d83d58beee03d34412a714
Commit Graph

4586 Commits

Author SHA1 Message Date
Ater Ignis
e79df68ef3 added new assembled timer-igniter assembly and added that to default chem-grenades 2012-11-01 17:49:21 +04:00
Ater Ignis
72f3c70da9 primed grenades must not be disassembable easy 2012-10-28 11:20:42 +04:00
Ater Ignis
2acba34e11 fix of names in grenade 2012-10-27 19:48:48 +04:00
Ater Ignis
6337048aad updated grenades, now with remote control, proximity control and timer control for your choosing 2012-10-25 19:56:32 +04:00
Cael_Aislinn
96813cac8e another partial fix 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-25 21:30:26 +10:00
Cael_Aislinn
b35fc75a33 partial antiqua compile fix 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-25 21:23:40 +10:00
Cael_Aislinn
d3f77398a6 decreased blob expand rate from 3 seconds to 7 seconds 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-25 20:39:00 +10:00
Cael_Aislinn
7aee209637 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 2012-10-25 00:35:19 +10:00
Cael_Aislinn
a9431fcecf removed immovable rod from occurring, removed space dust, doubled time between events 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-24 23:06:41 +10:00
headswe
0d98248b6f Merge pull request #1821 from comma/master 
Pain & Other Ported Things
 2012-10-23 08:47:30 -07:00
headswe
903464af45 Merge pull request #1774 from jediluke69/master 
fixes for maintance access
 2012-10-22 17:07:31 -07:00
jediluke69
650064daaf Update code/game/jobs/access.dm 2012-10-22 14:41:25 -03:00
Chinsky
b46c887469 Ported implants. 
Compressed matter implant.
Death alarm implant.
Made explosive implant work like pre-merge: trigger on code phrase instead of host's death.
 2012-10-22 17:52:27 +04:00
Cael_Aislinn
c0e7ad00b2 merge fixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-22 20:25:27 +10:00
Cael_Aislinn
dd538fd3c5 Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport 
Conflicts:
	code/game/gamemodes/events.dm
	code/game/gamemodes/wizard/veilrender.dm
	code/game/jobs/job/captain.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/structures/grille.dm
	code/modules/mob/living/simple_animal/life.dm
	code/setup.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-22 20:15:05 +10:00
Cael_Aislinn
9340f70252 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	icons/obj/items.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-22 19:35:03 +10:00
giacomand@gmail.com
6f7c26629d -Changed xeno to have a safe way to hatch eggs with plasma. 
http://imgur.com/80LJx

-Added a turf meter which shows the air contents of a tile.
-Added a simple vent controller for the dual vents.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4935 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-22 05:41:00 +00:00
Kortgstation@gmail.com
068fc7afda Replaced a ton more for viewer in range things with visible_message 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4934 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-22 04:30:19 +00:00
Kortgstation@gmail.com
20ddf29dae Syndicate simple animals will now attack windows/grilles/closets/tables they come into contact with so you can't cheat and tank with them. 
Added an attackanimal to closets. Anything with wall_smash will be able to break them. This means Juggernauts can punch open closets now.

Replaced all the for mob in viewer shit with visible_message in OpTable.dm and table_racks.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4933 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-22 02:26:34 +00:00
Chinsky
ad7cd0ed58 ID biometry. 
Bloodtype, DNA and fignerprint are back to ID
 2012-10-22 00:41:43 +04:00
Chinsky
4d9d407aa6 Added back tape rolls. 
Two rolls in engie lockers because there are only tow lockers on map
 2012-10-22 00:16:22 +04:00
giacomand@gmail.com
d5422f6a7e -Grilles can now be destroyed by fires. 
-Added a define for the minimum amount of damage a mob takes from plasma.
-Increased it to 20, from 10.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4931 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-21 19:03:50 +00:00
Chinsky
5e4273c919 Fixed runtime in secure briefcase code. 2012-10-21 17:58:54 +04:00
Chinsky
7ae59ba6f7 Slapped a few nullchecks near reported runtimes. 2012-10-21 16:41:44 +04:00
Kortgstation@gmail.com
3a52f9b2b7 Added items to the crates on the space battle map. Added new areas for the various syndicate ships instead of all of them being Nanotrasen Cruiser. 
Captain now spawns with an armoured vest on and his spacesuit spawns on the rack with his jetpack/helmet. This means the suit will exist even if a captain doesn't at round start.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4930 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-21 10:31:16 +00:00
Chinsky
52f9c0c9dc Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-21 05:52:18 +04:00
Chinsky
77d12b5e19 Added photos to security and medical records terminals. 
Generated during record creation, smaller version of char setup preview code.
 2012-10-21 05:45:36 +04:00
giacomand@gmail.com
6616314ca6 -Cleaned up Simple Animals by having a hostile class which will handle standard attacking, then the childs of that class can override the procs to do something different, if needed. 
-Cameras won't shock you anymore, when cutting the power wire.
-Cultists cannot be gibbed by placing more runes that is allowed, instead it says no and to clear any unused runes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4926 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-21 01:31:41 +00:00
d_h2005@yahoo.com
15c4b01c9f -Monkeys can now wear luchador and sexy clown masks, among others. 
-Wood chairs are actually constructable now.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4922 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-20 19:17:21 +00:00
Chinsky
179c510547 Makes briefcase start without paper. 
All jobs that start with it have plenty of places to get paper.
 2012-10-20 22:50:01 +04:00
Cael_Aislinn
9f67811427 Merge remote-tracking branch 'remotes/git-svn' 4921 into bs12_with_tgport 
Conflicts:
	code/game/machinery/computer/HolodeckControl.dm
	code/modules/mob/living/simple_animal/life.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-21 02:59:35 +10:00
Cael_Aislinn
fbf3396e4c map compile fixes, added a surprise to the teleporter 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-21 02:51:30 +10:00
Cael_Aislinn
0f3f008ff6 mergefixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-21 02:22:06 +10:00
Cael_Aislinn
01d3e3bf79 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	code/datums/disease.dm
	code/modules/reagents/Chemistry-Reagents.dm
	icons/turf/areas.dmi
	maps/tgstation.2.0.9.1.dmm

yep, this time going to merge map updates before making map changes >.>

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-21 01:25:04 +10:00
Cael_Aislinn
2a07ba0f6e mergefixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-21 01:04:37 +10:00
aranclanos@hotmail.com
7bbf30c800 Fixes issue 1007. Changed the throwforce of the holodeck energy swords from 5(!) to 0. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4921 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-20 14:39:11 +00:00
Cael_Aislinn
2f853fe23a Merge remote-tracking branch 'remotes/git-svn' r4920 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/objects/items/devices/radio/radio.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client procs.dm
	code/modules/mob/living/say.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/paperwork/paperbin.dm
	html/changelog.html
	icons/turf/areas.dmi
	maps/RandomZLevels/assistantChamber.dmm
	maps/RandomZLevels/fileList.txt

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-21 00:25:05 +10:00
Cael_Aislinn
3fe88c4fef mergefixes, misc 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-21 00:11:01 +10:00
headswe
4a7c435748 Merge pull request #1802 from comma/master 
Runtime
 2012-10-20 06:21:50 -07:00
aranclanos@hotmail.com
e4bcc80405 git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4917 316c924e-a436-60f5-8080-3fe189b3f50e 2012-10-20 02:51:12 +00:00
giacomand@gmail.com
ba32520ca2 -Forgot to remove a debug message. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4916 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-20 02:23:26 +00:00
giacomand@gmail.com
28fbd01e7f -Added a new, and admin spawnable only, machine which can turn humans into Cyborgs. Probably can be used for Robot Uprising events. The human has to be lying down and alive to be Borged. When spawned a conveyor belt will spawn on the left and right side too. 
-Reduced the duration of the flare. I think putting it in process() made it last longer.

-Added some null checks in camera chunks.

-Large NarSie now force calls the shuttle and displays a threatening warning message.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4915 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-20 02:13:40 +00:00
giacomand@gmail.com
1e1f173ca2 -Added large Nar-Sie. It is summoned by Cultists instead of regular Nar-Sie. 
-Larger icon provided by HornyGranny.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4914 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-19 20:38:53 +00:00
cib
926036a660 Fixed a few more problems with RP revolution and anti revolution. 
Heads now get the chance to resign.
RP rev convert verb now is in the IC tab
 2012-10-19 11:28:52 -07:00
cib
c4d4f1950e Fixed an error in the anti-revolution objective description. 2012-10-19 11:08:07 -07:00
cib
ce76e802f1 Fixed a small bug with anti-revolution. 2012-10-19 10:33:54 -07:00
cib
bf3e910a12 Merge branch 'master' of github.com:CIB/Baystation12 2012-10-19 10:17:02 -07:00
cib
bf83e5c3ba Added a new mode: anti-revolution 2012-10-19 10:00:54 -07:00
cib
172c974111 Changed the announcement for RP revolution. 2012-10-19 08:59:33 -07:00
cib
180a6267ef Small bugfix for rp revolution. 
Lategame assigned head revolutionaries would still be regular revolutionaries.
 2012-10-19 13:57:34 +02:00