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

2526 Commits

Author SHA1 Message Date
Zuhayr
981e7ff3d7 Description fix for posibrains, reset timer on posibrain search, minor fix for Gau's seedbag. 2013-01-06 12:20:51 -08:00
Zuhayr
491821f8f7 Forgot the actual positronic brain file. Yay. 2013-01-06 10:53:29 -08:00
Zuhayr
4f93d392f4 Added sprites and basic code for positronic brains. 2013-01-06 04:04:25 -08:00
Chinsky
24a02f90b9 Ported coats pockets 2013-01-04 05:31:14 +04:00
Chinsky
08605251b2 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-01-02 17:54:12 +04:00
Chinsky
8d0384ece4 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-01-02 17:50:53 +04:00
Hawk-v3
2bf16b7241 Merge pull request #2122 from GauHelldragon/master 
Farmbots! Adds new file farmbots.dm
 2012-12-31 18:42:20 -08:00
Hawk-v3
c612dd60da Merge pull request #2114 from GauHelldragon/master 
Robot HUD fixes
 2012-12-30 08:54:45 -08:00
Cael_Aislinn
0e9d6c163d runtime fix. the original code here was intended to make projectiles work with autopsy, but instead it just caused runtimes and made some mobs invulnerable 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-29 14:00:46 +10:00
Cael_Aislinn
c270fdb2ba compile and misc other fixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-29 13:23:43 +10: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
GauHelldragon
50489f28ed Fixes cyborg display when items are disabled due to power. 
Previously the hud would not be updated when power drops below 100 and items are disabled.
 2012-12-28 13:51:09 -08:00
GauHelldragon
a116225433 Fixes cyborg HUDs security and medical HUDs 
The images now go away when the module isn't active
 2012-12-28 13:37:17 -08: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
cib
03b52e77e6 Fix two compile errors. 2012-12-24 21:07:04 +01:00
cib
55c1ec2300 Added a display of active players in a job for latejoin. 2012-12-24 20:32:28 +01:00
cib
c5fb6aaf60 Low blood levels now actually make your nutrition drop. 
This'll help make people low on blood eat something.
 2012-12-24 20:20:15 +01:00
cib
d581ebe767 IV drips now can take blood as well as give it. 
This makes blood donations much easier.
 2012-12-24 18:25:48 +01:00
Hawk-v3
0917269fe3 Merge pull request #2101 from Ravensdale/master 
Port: Ai cores
 2012-12-22 09:29:53 -08:00
Ravensdale
0ec910729c Porting of old AI cores. Introduces Triumverate, Serithi's TRIBUNAL sprite made public with permission. 2012-12-22 09:25:47 -08:00
Hawk-v3
5f77acd30e Merge pull request #2095 from comma/inspace 
Inspace
 2012-12-22 08:27:42 -08:00
Hawk-v3
9df91430fd Merge pull request #2097 from comma/surgery 
Surgery
 2012-12-22 08:27:18 -08:00
Chinsky
6635fc2a83 Merge branch 'master' into inspace 2012-12-21 01:26:02 +04:00
Chinsky
b3580e8265 Merge branch 'master' into surgery 2012-12-21 01:07:36 +04:00
cib
84fe7c01af Fixed two issues with bullet hit chance. 
- Bullet hit chance was too low at close distance
- Missing wouldn't actually prevent the damage
 2012-12-19 21:44:05 +01:00
cib
b0289ce66d Bullets can now also miss, even after entering the same tile. 
This means that aiming for the head with a gun only makes sense from a short distance or when the target is restrained. Otherwise, you're likely to miss unless aiming for the chest.
 2012-12-19 21:20:07 +01:00
cib
596d944414 Added a mechanic that makes it possible to miss in melee. 
Only happens when the target is neither laying nor restrained. In this case, there are various chances to miss the targetted organ, and either hit nothing, or a different organ.
 2012-12-19 20:40:29 +01:00
cib
d0735e9a87 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature 
Conflicts:
	code/ZAS/ZAS_Zones.dm
	code/game/gamemodes/events.dm
 2012-12-16 15:10:04 +01:00
cib
933e53aa98 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into minor_feature 
Conflicts:
	code/game/gamemodes/events.dm
 2012-12-16 15:02:54 +01:00
cib
679c715482 Merge branch 'master' of github.com:Baystation12/Baystation12 into minor_feature 2012-12-16 14:57:54 +01:00
cib
7cf3244316 Fixes issue #2059 
Mob transform into monkey no longer uses hardcoded DNA size of 14.
 2012-12-16 04:57:32 +01:00
cib
cc2057240a Fixed two compile errors. 2012-12-16 04:23:57 +01:00
cib
9c4a48ffe5 Gibbing now creates actual limbs instead of decals. 
Especially useful for the head, but also pretty nice in that you can now pick the limbs up and mail them to security.
 2012-12-16 03:25:26 +01:00
Cael_Aislinn
d1cf168480 Merge remote-tracking branch 'remotes/Baystation12/Baystation12/master' into work_in_progress 2012-12-15 00:39:07 +10:00
cib
8b90cd6fa8 Experimental: Disable temperature exchange with space and add low 
pressure damage.

This'll stop the ridiculous cold temperatures from opening an airlock
for half a second.
 2012-12-11 14:57:28 +01:00
cib
f664e7c99d Fixes issue #2033 2012-12-11 12:07:11 +01:00
Cael_Aislinn
d6a1bade5b Merge branch 'features' into work_in_progress 2012-12-11 12:39:22 +10:00
Cael_Aislinn
21c9f55654 Merge remote-tracking branch 'remotes/Baystation12/Baystation12/master' into work_in_progress 2012-12-11 12:38:58 +10:00
Mloc
9d60a87ee4 Merge pull request #2020 from GauHelldragon/master 
Service Borg Upgrade
 2012-12-10 08:44:33 -08:00
Chinsky
5cda793bc4 In space, no one can hear you scream now. 
Well, people adjacent to you can. And people on radio...
Seems kinda pointless now that I think about it, but eh.
 2012-12-08 18:47:16 +04:00
Cael_Aislinn
f7d41058ed Merge branch 'work_in_progress' of github.com:caelaislinn/Baystation12 into features 2012-12-03 18:56:16 +10:00
Cael_Aislinn
39f07d50bf Merge https://github.com/Baystation12/Baystation12 into features 2012-12-03 18:54:21 +10:00
Cael_Aislinn
cc2771d4d5 thrown facehuggers only have a 25% chance of hitting now, and they have a chance to miss when leaping normally 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-03 13:58:58 +10:00
Cael_Aislinn
ee04fd9f1e significantly reduced alien disarm-stun time (from 10-15 seconds to 0.5-3 seconds), reduced stun chance, added a 25% chance to stun the alien, reduced alien heal rate on weeds from 5 to 1 (they still heal toxin damage at a rate of 5) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-03 13:54:29 +10:00
Cael_Aislinn
d09d7bf313 changed alien neurotoxin to bio type projectile (which means it's stopped by protective gear like biosuits), fixed a runtime 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-03 13:50:57 +10:00
Cael_Aislinn
d55170ab97 fixed an extra line added 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-03 01:04:14 +10:00
Cael_Aislinn
3b6c00eae5 made space ninja a toggleable client option 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-01 18:07:18 +10:00
Cael_Aislinn
c8f603cebd WIP stuff for skin styles sprite accessory 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-01 18:07:02 +10:00
Cael_Aislinn
7e3f58cea2 CPR optimisations, made hypospray visible on the map 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-01 18:06:19 +10:00