cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-04 14:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,500 Commits 26 Branches 2 Tags
7b723bfb828fbdef2fafe3eacbae6876cb8b69bf
Commit Graph

1349 Commits

Author SHA1 Message Date
Mloc-Argent
27759f47df Merged master into BEF. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-05-06 15:43:50 +01:00
fauxtada
fed2bfcedc fixed michael guess' zippo, added therapy doll dmis to code, the items aren't coded because i cannot get it to work for the life of me. 2013-05-02 02:00:04 -07:00
Spamcat
0acd40326f Increased pill bottle capacity to 14 pills (2 rows). 
Also fixed #2714.
 2013-04-30 15:44:31 +04:00
jediluke69
e256f2d095 should nerf nanopaste 2013-04-24 19:42:19 -04:00
NerdyBoy1104
390029007d Added Rice and Plastellium plants. Rice stalks are grinded into rice that you can make boiled rice, rice pudding and Sake from. Plastellium is refined into plastic by grinding it into plasticide. 20 plasticide + 10 poly acid makes 10 sheets of platic which can be used to make crates, forks, spoons, knives, ashtrays or plastic bags from. 2013-04-23 22:52:08 +01:00
Ravensdale
2f6fdf556d final tweak for cap's PDA to do as advertised. 2013-04-18 09:56:51 -07:00
Ravensdale
cda1248be7 Bugfix: Adds in a check to make sure atmos code has been loaded before trying to generate, preventing some runtimes. 
Tweak: Removes captain's armour from spawn code.

Tweak: Captain's PDA now spawns with messenger on but is now undetonateable.
 2013-04-18 09:56:50 -07:00
SkyMarshal
f05b8e0083 Fixes issues: 
#2632 Fire Issues (Fire doors work, Flamethrower reverted to making a flamethrower liquid fuel subtype, flame grenades now make a puddle of welder fuel that is lit aflame with napalm)
#2630 (The code has been calling (turf).temperature_expose when it was supposed to be hotspot_expose), #1865 (aqain)(Added a check to remove trace gas fuel under a certain point).
Also: added a flashpoint value for plasma, which is the temperature at which it self-ignites (Currently 246C or 519K which is equal to gasoline)
Partial-tile firedoors now default to full-tile firedoors as the part-tile ones were breaking ZAS zones entirely.  Possible cause of #2627 and maybe #2451, but those need tested and I did not have time.
 2013-04-18 09:56:49 -07:00
Spamcat
e40ff1bfc4 No need for dis shit. 2013-04-17 14:21:44 +04:00
Ravensdale
09212483bc final tweak for cap's PDA to do as advertised. 2013-04-16 08:47:23 -07:00
Ravensdale
19c7c8d651 Bugfix: Adds in a check to make sure atmos code has been loaded before trying to generate, preventing some runtimes. 
Tweak: Removes captain's armour from spawn code.

Tweak: Captain's PDA now spawns with messenger on but is now undetonateable.
 2013-04-16 08:43:19 -07:00
Spamcat
44401cf03e Fixed blood overlays for batons. Also,changelog. 2013-04-15 22:23:09 +04:00
Spamcat
d8f825894a Telescopic baton, biatch. Bastard child of baton and energy sword. 
Added one in HoS's locker.
 2013-04-15 02:47:48 +04:00
SkyMarshal
7d114d22bd Fixes issues: 
#2632 Fire Issues (Fire doors work, Flamethrower reverted to making a flamethrower liquid fuel subtype, flame grenades now make a puddle of welder fuel that is lit aflame with napalm)
#2630 (The code has been calling (turf).temperature_expose when it was supposed to be hotspot_expose), #1865 (aqain)(Added a check to remove trace gas fuel under a certain point).
Also: added a flashpoint value for plasma, which is the temperature at which it self-ignites (Currently 246C or 519K which is equal to gasoline)
Partial-tile firedoors now default to full-tile firedoors as the part-tile ones were breaking ZAS zones entirely.  Possible cause of #2627 and maybe #2451, but those need tested and I did not have time.
 2013-04-09 00:49:19 -07:00
Asanadas
f3e1ff57d6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-04-04 01:15:03 -04:00
Spamcat
020a555f0f Fixed #2596. 
also fixed #2599 in my map commit
adding these so issues would automagically close when merged because no-one closes them ever
 2013-03-31 15:19:09 +04:00
Asanadas
f3d605abe3 De-Culting and you! Null Rods re-receive the ability to de-cult cultists, and a tiny desc change. Holy Water also has the chance to de-cult on metabolism, but less of a chance than the null rod. Holy Water may need some balance adjustments, will watch it in the future. 
Signed-off-by: Asanadas <asanadas@hotmail.com>
 2013-03-27 19:45:40 -04:00
Spamcat
4ad2ce87a6 bleh, removed stray debug thingy 2013-03-24 14:40:15 +04:00
Spamcat
285a1dd89e Arrivals announcement computer strikes back! 
phew, took me long to get rid of it
 2013-03-24 02:20:57 +04:00
Asanadas
0a21e8a4f4 Whoops spelled internal affairs wrong. This pretty much overwrites the lawyer job with an Internal Affairs Agent, made to Cajoes guidelines to the best of my ability. New suit, messed up PDA, and loyalty implanted / answering to the captain to maybe they'll have more pull on the server. 
Signed-off-by: Asanadas <asanadas@hotmail.com>
 2013-03-21 02:59:29 -04:00
Spamcat
86cc28dd57 Fixed posibrain installed into spiderbot bug, made posibrains a child class of MMI. 2013-03-19 14:37:21 +04:00
Spamcat
5e2c921933 Fixed nanopaste messages. 
(and some my shitcode)
 2013-03-18 18:01:51 +04:00
Christian Bielert
14a96f77ab Merge pull request #2539 from comma/organ 
Organ code restructuring
 2013-03-16 07:10:40 -07:00
Cael_Aislinn
435ceda41f Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-15 20:37:35 +10:00
RavingManiac
585fed0005 Intercom canhear_range reverted to 2. 
Intercom in interrogation observation room shifted to cover the whole room.
 2013-03-15 02:19:58 +08:00
Chinsky
a2e2c373ef Added new item - nanopaste. 
Researchable by RnD (materials and engineering tech), used to repair robots and robolimbs more efficiently (twice as fast and both damage types at once).
 2013-03-13 05:57:53 +04:00
Chinsky
4f58416332 Merge pull request #2522 from RavingManiac/bleeding-edge-freeze 
Intercom tweaked and notice boards added
 2013-03-11 17:15:11 -07:00
RavingManiac
2d49b05f93 Intercom hear range (that is, the distance at which it can be heard) changed from 2 tiles to 7 tiles, matching the viewing distance. 
Notice boards added to research, security, engineering break room, medbay lobby, HoP's desk, bridge, cargo bay, cargo lobby and mining.
 2013-03-12 03:45:55 +08:00
Chinsky
b207349c44 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-11 01:18:10 +04:00
Cael_Aislinn
f8f9397636 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	icons/obj/library.dmi
	icons/obj/storage.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-10 23:01:33 +10:00
Cael_Aislinn
86a58380b3 added bees supply pack to cargo bay, made vending machine produce beezeez, make apiaries constructable out of wood 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-09 23:39:24 +10:00
ericgfwong@hotmail.com
6ac93ddd4d Added new descriptions to each of the rigs and gave them unique armor values. 
Medical PDAs should now have a green stripe

Fixed a misplaced /area/ issue in the Warden's office

git-svn-id: https://tgstation13.googlecode.com/svn/trunk@5602 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-03-09 07:43:04 +04:00
Cael_Aislinn
53793fc2aa Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	baystation12.dme
	code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm
	icons/obj/storage.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 19:03:18 +10:00
Zuhayr
3774b16839 Made spiderbots buildable, animated spiderbot sprites. 2013-03-02 02:15:39 -08:00
Zuhayr
2381aa2dca Rename of cyborgs to robots (in strings), addition of robot spawn name-choosing proc, addition of method for removing robot brain. 2013-02-25 19:48:00 -08:00
Cael_Aislinn
46ecf43cf9 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	baystation12.dme
	code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm
	icons/obj/device.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 14:40:46 +10:00
Cael_Aislinn
9b8387ac05 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	baystation12.dme
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/research/xenoarchaeology/misc.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 14:27:44 +10:00
Cael_Aislinn
ec023cc3f8 tweaks to finances (inc boost to wallet capacity, new sprite for eftpos) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-23 21:51:29 +10:00
Chinsky
29b1ef1c63 Derp, forgot main part of explosive implant EMP code and changelog. 2013-02-23 00:41:20 +04:00
Chinsky
b208a953d0 Made EMP less instarape switch for Nuke Team. 
Instead of 50% chance to go off, it goes like that
30% Nothing happens
70% Malfunction:
    50% Tear off limb / big wound
    50% Bad malfunction:
      50% BOOM
      50% meltdown, won't activate ever

Which takes it from 50% to 17.5%
 2013-02-23 00:09:05 +04:00
Cael_Aislinn
8ee5672159 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-22 23:56:38 +10:00
Cael_Aislinn
66b04ccf1d made circuits to construct RUST computers researchable, made circuits to construct wall mounted RUST machinery researchable, made other RUST machinery orderable via QM 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-22 20:00:05 +10:00
Chinsky
6015df7178 Tweaks to side effects. 
Removed itch one. Caused lots of whining, since it's quite counterintuitive to take drugs to treat itch instead of scratching it or removing bandage.
Made side effects contracting probability-based, probability higher the stronger chemical is.
 2013-02-20 20:00:01 +04:00
Chinsky
fa1d81fbae Fixed derp. 
Compile errors because I am retarded.
 2013-02-20 10:38:36 +04:00
Chinsky
28c8c67946 Fixes issue #2384 Uplink now spawns proper implanters. Fixed missing icon for compressed matter implant. 2013-02-20 09:20:32 +04:00
Chinsky
41f09299c9 Compressed implant item now will be put in hands instead of the floor. 2013-02-20 09:17:41 +04:00
Chinsky
eb03e35296 Fixes issue #2384 
Uplink now spawns proper implanters.
Fixed missing icon for compressed matter implant.
 2013-02-20 09:15:27 +04:00
Chinsky
54e958d186 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-02-19 16:44:30 +04:00
Jamini
15fcdafe8e Third time is a charm. Fixed a bunch of map things and reverted the axe back to it's premerge values. Also added airlocks back to mining. 
Signed-off-by: Jamini <mobiousjami@gmail.com>
 2013-02-17 20:59:36 -05:00
Chinsky
92c8c34c2a Removed getDisplayNameProc(), since all organs have display_name var anyway. 
Moved some severed head code into it's New() for readability.

Fixed noexplode flag in droplimb still making limb give explosion message.
 2013-02-17 19:12:00 +04:00