cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-25 17:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,689 Commits 29 Branches 2 Tags
981e7ff3d7c33a9f00837603a2d522bb57d7bbcb
Commit Graph

596 Commits

Author SHA1 Message Date
Chinsky
24a02f90b9 Ported coats pockets 2013-01-04 05:31:14 +04:00
Chinsky
cb5e61280b Fixed contraband and surgery crate runtimes. 2013-01-03 04:35:33 +04:00
Cael_Aislinn
c0102cf13e Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/defines/procs/global_lists.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/mecha/working/ripley.dm
	code/modules/mob/living/carbon/human/human_attackalien.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/new_player/preferences.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-29 13:06:03 +10:00
Cael_Aislinn
31349fb7d3 Merge branch 'incremental_tg' r5067 into bs12_with_tgport 
removed extraneous admin attack messages, temporarily disabled much moderator stuff (will be re-enabled in future updates)

Conflicts:
	baystation12.dme
	code/__HELPERS/type2type.dm
	code/controllers/configuration.dm
	code/datums/datumvars.dm
	code/datums/helper_datums/getrev.dm
	code/defines/obj.dm
	code/game/gamemodes/events/black_hole.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/job.dm
	code/game/jobs/job_controller.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/machinery/turrets.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/turfs/turf.dm
	code/game/verbs/ooc.dm
	code/global.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/admin.dm
	code/modules/admin/admin_memo.dm
	code/modules/admin/admin_verbs.dm
	code/modules/admin/holder2.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/adminpm.dm
	code/modules/admin/verbs/diagnostics.dm
	code/modules/assembly/igniter.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/jobs.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/mob/new_player/preferences.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/photocopier.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/modules/reagents/Chemistry-Machinery.dm
	code/setup.dm
	code/stylesheet.dm
	code/world.dm
	config/admins.txt
	config/config.txt
	html/changelog.html
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
	icons/turf/areas.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-28 14:13:11 +10:00
Cael_Aislinn
e6c70937e5 Merge branch 'incremental_tg' r4967 (27/10/2012) into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/__HELPERS/game.dm
	code/__HELPERS/type2type.dm
	code/datums/helper_datums/getrev.dm
	code/game/atoms.dm
	code/game/gamemodes/events.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/computer/atmos_alert.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/computer.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/prisoner.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/newscaster.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/machinery/telecomms/telemonitor.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/objs.dm
	code/modules/DetectiveWork/detective_work.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/admin.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client procs.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/machine_stacking.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mint.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/mob.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/paperwork/photocopier.dm
	code/modules/power/gravitygenerator.dm
	html/changelog.html
	icons/mob/head.dmi
	icons/mob/human_face.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/suits.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-28 01:07:36 +10:00
Chinsky
581f2c4db5 Merge branch 'master' into crates 2012-12-21 01:03:20 +04:00
cib
e0a500377c Fixes dropped cyborg limbs being human. 
Makes them cyborg parts instead.
 2012-12-19 23:30:58 +01:00
cib
2233d0dc8e Fixed a bug with EMP's and robolimbs. 
Light EMP's were much more likely to destroy robolimbs than heavy ones.
 2012-12-19 23:00:01 +01:00
Chinsky
ecc73ec805 Made contraband crate not being LABELED as contraband and removed supply manifest from it. 
I mean, really, paperwork for contraband?
 2012-12-06 18:57:44 +04:00
Chinsky
d567d88749 Fixed issue with severed heads not being visible 2012-12-06 18:20:56 +04:00
Chinsky
0b614a488c Made bandages stop bleeding when applied, not waiting until next 20-tick organ update cycle. 2012-12-02 00:02:43 +04:00
Chinsky
2e2c1e8c4c Merge branch 'master' into crates 2012-12-01 07:14:31 +04:00
Hawk-v3
2197fd6cbc Merge pull request #2000 from Whitellama/master 
Map Fixes
 2012-11-23 17:52:27 -08:00
cib
300219813d Fix for cryo stopping bleeding. 
Forgot that internal bleeding doesn't use drip()
 2012-11-23 16:04:16 +01:00
Whitellama
20bf7f6a2b Fixed the lack of job alt-titles in Crew Manifest 2012-11-21 22:02:18 -08:00
cib
316af619f8 Rebalanced internal bleeding. 2012-11-21 22:42:20 +01:00
cib
6fbff77163 Re-nerf lung capacity due to problems with internals. 2012-11-21 22:41:35 +01:00
cib
e24d6ee902 Reduced internal bleeding speed. 2012-11-18 15:59:28 +01:00
Chinsky
ea4f34d53c Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/ZAS/FEA_system.dm
 2012-11-17 00:20:23 +04:00
Ater Ignis
137ed48938 clean out 2012-11-16 19:18:28 +04:00
Ater Ignis
a96e4c3600 if amputated full arm or leg, make hand or foot amputated too 2012-11-16 19:00:45 +04:00
Ater Ignis
4ed9b40cb9 tajarans see_in_dark -> 8, disembodied organs rendering correction 2012-11-16 18:41:26 +04:00
Chinsky
e6a2bb594b Reverted revert of my fix. No idea why I did that at all... 2012-11-16 18:28:09 +04:00
Ater Ignis
3d88251a3f limbs patch 
*don't drop limbs if already did that
*subraces icons for limbs
*left and right legs
 2012-11-16 17:12:17 +04:00
Ater Ignis
46bd2ce7e6 human icon generation update, tajarnan darkseeing 
*lying icon generated from standing one
*sprites for dismembering major races (tajarnan,skrell,soghun)
*tajarnans can see in darkness better than others
 2012-11-16 15:19:20 +04:00
Chinsky
750dc608fc Should prevent cloned Skrells and cats losing ears/tentacles after cloning. 2012-11-16 13:36:58 +04:00
Chinsky
c431877bf0 Made burns not cause internal wounds. 2012-11-16 12:18:28 +04:00
Chinsky
3f0eb4836f Ported some crate types frpm pre-merge. 
Moved posters to arts crate and lipstick with cigs to party crate.
Contraband crate now has killer tomato seeds, illegal booze and drugs.
 2012-11-15 17:17:56 +04:00
cib
7ae7099098 Ported autopsy. 2012-11-14 20:31:31 +01:00
cib
c96d245f2d Fixed a bug where all organs would heal always. 2012-11-14 18:01:55 +01:00
cib
397f010de5 Buff bandage healing speed. A LOT. 2012-11-14 16:51:58 +01:00
cib
450248864b Added lung rupturing and lung surgery. 2012-11-14 16:20:47 +01:00
aranclanos@hotmail.com
6bd913a6a5 Some small changes and fixes on my last commits. 
-Removed the extra dot on mineral wall descriptions
-Uranium walls can be dismantled with objects again
-Moved around the commented out code in walls_mineral.dm
-Improved the code by changing the typesof() procs to ispath()
Thanks to Carn and Sieve

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5062 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-11-14 14:07:34 +00:00
johnsonmt88@gmail.com
b86d90c6c2 Couple of bugfixes: 
Wizards can no longer cast spells when muzzled. Fixes issue 843.

You can no longer take bags of holding or mechs to the clown planet. Fixes issue 1061.

Removed the infared sensor from the autolathe construct list. Fixes issue 1092.
- The infared sensor already does nothing, the code for it seems to have been removed ages ago, so there's no harm in doing this.
- Commenting out the define caused a few problems that I couldn't quite figure out. I'll leave it for now with a warning.

Removed the ability for pAI's to set arrest status. Dead players really shouldn't be allowed to grief people like that. Fixes issue 1093.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5060 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-11-14 01:17:40 +00:00
cib
422ec63bfc Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/human.dm
 2012-11-13 19:01:03 +01:00
cib
c1fb2766b7 Increased the progression time for appendicitis and alien embryo. 2012-11-13 18:54:54 +01:00
cib
2eb4022fe4 Surgery now triggers specialized pain messages if not done with anesthetic. 2012-11-13 17:06:06 +01:00
cib
ef4ee093a5 Balance fixes to internal wounds. 
- Their damage now increases more slowly.
- They now cause faster bleeding.
- They can't be cured anymore with bicaridine etc.
 2012-11-13 16:01:43 +01:00
Chinsky
d5e8f90a9e Made virus crate spawn with virus2 samples instead of old ones. 2012-11-13 17:45:22 +04:00
aranclanos@hotmail.com
dee7b74a45 -Changed turf creations, merging everything to only one proc 
-Fixes Issue 1085 - Artificers creating turfs with buggy lighting
-Spells now will use the proper proc to create turfs

Due to the amount of files changed, this is just the 'part one'. The merging in turf.dm is not finished, mineral walls and buildmode are still using the old system. The creation of turfs on the game panel is not using the proper procs yet. Stay tuned for this changes, but now, sleep.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5054 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-11-13 13:39:00 +00:00
giacomand@gmail.com
b81901685e -Updated the changelog with the changeling change By Kor. 
-Removed the buy menu from the old mob when transferring minds from a changeling.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5053 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-11-13 04:00:08 +00:00
giacomand@gmail.com
7955d348d8 Lots of bugs fixed for advance diseases. 
Fixed advance diseases using the same reference in mobs.
Fixed advance diseases referencing other advance diseases' symptoms, instead of just copying it.

I tested it more thoroughly this time and I can't find any issues but if you do please add them to the bug tracker and or contact me on #coderbus.

Added a new reaction which will remove symptoms from a disease. Needs blood and synaptizine.
Added a new symptom, shivering will make you cold.

Tweaked and balanced some symptoms.

Removed the "flex" emote that hulks will do randomly.
Reduced the change to speak for hulks and brain damaged mobs. ( 7% -> 3% chance)

Please let me know if anything is out of place or wrong.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5048 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-11-13 00:28:07 +00:00
cib
4b331f3676 Fixes to internal bleeding. 
- Created internal wound doesn't close instantly anymore.
- Small fix to body scanner display.
 2012-11-12 14:16:19 +01:00
cib
6d3e742992 Large amounts of damage can now trigger internal bleeding. 2012-11-12 13:38:55 +01:00
cib
95181d96a8 Several fixes to germs. 2012-11-12 13:17:11 +01:00
cib
e92cecdefe Added basic germ code. 
This will only trigger in surgery for now - That is when you cut someone open in surgery, you'd better wash your hands before, or otherwise you'll get infected wounds.
 2012-11-12 12:51:28 +01:00
elly1989@rocketmail.com
35cac8aefc Moved one or two bits out of +FUN and into a +SPAWN flag. The spawn flag allows mob transformations, spawning of items etc. 
Moved fun (admin-event stuff) up to badmin rank.
deadchat visibility defaults to on
removed update_admin()
fixed associate so it won't accidentally add people to the admins list multiple times.
toggling ooc on/off is now available to any admin regardless of rights.
mass deletion is now restricted to DEBUG or SERVER flags
ADMIN, SERVER, DEBUG can all use the delete verb

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5032 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-11-09 21:58:10 +00:00
giacomand@gmail.com
d71cc8f3d6 -Advance diseases were given a good bug fixing based on reports and runtimes. Including the diseases spreading correctly. 
=Proposals=

-Cyborgs can now beep and ping.
-Hulks will now talk in all upper-case and will spurt out random hulk phrases and flex.

=Sprites=

-Improved APC sprite by TankNut.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5031 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-11-09 21:12:59 +00:00
Chinsky
18f56f4a38 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-09 14:32:49 +04:00
SkyMarshal
9b3389145e Fixed some runtimes with mulebots, the security computer, and the medical computer, as well as readded the nice prompt the cloner gives to ghosts when they are being cloned. Fixed an odd compile error. 2012-11-08 14:49:01 -07:00