cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 19:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,899 Commits 26 Branches 2 Tags
f052d8d97275f2b749b3e0fd5000af17bf795820
Commit Graph

996 Commits

Author SHA1 Message Date
Chinsky
f052d8d972 Added boxes for vials. Usual and secure version(default to viro access) 
Changed vial lid sprite slightly.
 2013-06-16 11:20:32 +04:00
Chinsky
e40140be03 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
	maps/tgstation.2.1.0.0.1.dmm
 2013-06-08 05:55:42 +04:00
Chinsky
57c1ebb285 Merge pull request #2977 from MagmaRam/master 
Fix for security belts not holding all seven items sometimes
 2013-06-05 06:21:47 -07:00
MagmaRam
ae697179c9 Fix for security belts not holding all seven items if the total combined w_class of the items is over 14. They should now be able to hold seven of any items that fit in them. 2013-06-05 20:14:11 +07:00
MisterBook
606a510168 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
 2013-05-31 22:58:01 -05:00
Furlucis
24098c6529 UNadded robotic hands and feet because there was no point in doing this in the first place. 
Signed-off-by: Furlucis <Logman115@gmail.com>
 2013-05-31 22:32:39 -04:00
Furlucis
e32b253a41 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-05-31 20:01:57 -04:00
MisterBook
06b7700086 Cobpipe fix 
Smoking pipe icon fix.
Eye-stab admin logging fix.

Tasers now do halloss, representing non-lethal PAIN.
http://baystation12.net/forums/viewtopic.php?f=5&t=7773

Tasers now check their target's limb for armor, and deflect if armored (Represented by coeffecient = 0).
http://baystation12.net/forums/viewtopic.php?f=5&t=7772
 2013-05-31 00:09:00 -05:00
Segrain
3409e1f05d Toolbelts can hold engineering tape. 2013-05-30 19:35:03 +03:00
Segrain
50f05f7a11 Pill bottles can hold paper. 
For prescriptions and such.
 2013-05-30 19:28:34 +03:00
Furlucis
08524aa4d2 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-05-27 01:48:44 -04:00
cib
cab1289511 Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	html/changelog.html
 2013-05-26 20:43:22 +02:00
meyar
c1e701f32b Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
 2013-05-24 05:23:36 -04:00
Kilakk
ef2c7af6a0 Telescopic baton message fix. 
Fixed first- and third- person extend/collapse messages for the
telescopic baton, woo
 2013-05-23 16:24:53 -04:00
meyar
ebe2e26ed3 Fixes the Syndicate nuke shuttle airlock (In that it cycles now) 
Re-added external airlock access to the traitor ID card, restoring lost functionality.
Fixed the ERT radio. It now works.
 2013-05-19 05:00:06 -04:00
meyar
c170f57ba7 Returns lost functionality to the traitor ID, letting a traitor re-forge their ID more than once. 2013-05-18 06:48:01 -04:00
Mloc-Argent
27759f47df Merged master into BEF. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-05-06 15:43:50 +01:00
Spamcat
0acd40326f Increased pill bottle capacity to 14 pills (2 rows). 
Also fixed #2714.
 2013-04-30 15:44:31 +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
Furlucis
17860ff33a Added robotic hands and feet. 
Apply screwdriver to robotic arms and legs to get hands/feet. They can
be surgically attached properly, far as I can tell. Also, fixed a few
backwards slashes in text marcos.
 2013-04-19 00:41:45 -04: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
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
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
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
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
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
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
Cael_Aislinn
7fba00ce55 miscellaneous fixes + tweaks + cleanups (spoons, artifacts, geotracking, helpers for finds, tools / gear) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-14 13:28:31 +10:00
Chinsky
4d7aa320cb Due to git tree being fucked up for some reason, manually reapplied many man many fixes. 
Just got to tip of real tree and got zipball, then unpacked it here.
 2013-02-07 07:13:27 +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
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
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
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
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
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
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
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
giacomand@gmail.com
35fbc6b1c7 - Implant pads will no longer be stuck inside your pocket. Fixes Issue 1058. 
- The free objective for cultists will be an automatic success.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5573 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-18 10:51:41 +00:00