cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-10 09:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,026 Commits 26 Branches 2 Tags
d0447f061adfbd5dde2bddd8fc40566149083b0c
Commit Graph

3474 Commits

Author SHA1 Message Date
Artorp
d0447f061a Fixes states of onedirectional windows 
Will only change the reinforced plasma window. You don't have to pry
them out of a frame before anchoring them anymore.
 2014-08-11 01:51:10 +02:00
Artorp
048f5235c9 Plasma construction and full window fixes 
- Fixed plasma window construction

- Fixed full windows from stopping players and gasses from moving above
them even with density set to 1
 2014-08-11 01:06:27 +02:00
Artorp
6c5b0f7987 Windows can now be disassembled 
- Using a wrench on a deanchored window will deconstruct it
 2014-08-10 21:51:06 +02:00
alex-gh
808e908dc6 Merge pull request #365 from Artorp/chemisty-changes 
Chemisty quality-of-life changes
 2014-08-09 22:34:54 +02:00
Artorp
5a22e5e8dd Station Blueprints fix 
Fixes the station blueprints.
 2014-08-09 09:24:02 +02:00
Artorp
4c59644d95 Enable medical belt quick pickup 
Using a medical belt on a bottle will attempt to pick up all bottles on
the tile.
 2014-08-09 02:51:15 +02:00
Graham Lloyd
2c4e98a726 Fireaxe cabinet hacking now fails if player moves away 2014-08-04 22:15:12 -04:00
ZomgPonies
509af0b236 Stun revolver rebalance. 25% more powerful than regular taser. Lost it's insta-stun 2014-08-04 01:54:27 -04:00
mwerezak
c22ea7a5c0 Fixes some handcuff oversights 
You now don't need to be grabbing to put handcuffs on yourself, and you
can now put hancuffs on if your grab state is higher than aggressive.
 2014-08-03 16:15:47 -04:00
mwerezak
2c7926eff8 Stunbaton fixes and cleanup 
Apparently harm intent is "hurt", not "harm"

Conflicts:
	code/game/objects/items/weapons/stunbaton.dm
 2014-08-03 16:09:38 -04:00
mwerezak
3eae360963 Handcuffs now require an aggressive grab 
Conflicts:
	code/game/objects/items/weapons/handcuffs.dm
 2014-08-03 16:07:35 -04:00
mwerezak
279718728f Allows the use of stun weapons to show up in autopsies 
Conflicts:
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/carbon/human/human_defense.dm
 2014-08-03 16:00:48 -04:00
mwerezak
f43a3ead70 Merges taser and stun baton effects 
Makes the code for handling stun weapon effects much cleaner.
Moves electrocute_act and emp_act from living.dm into living_defense.dm

Conflicts:
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/living.dm
 2014-08-03 15:59:21 -04:00
mwerezak
64638987dc Adds siemens_coefficient handling to stun batons 
Conflicts:
	code/game/objects/items/weapons/stunbaton.dm
 2014-08-03 15:54:34 -04:00
ZomgPonies
f2f1b53791 Meh 2014-08-03 15:48:09 -04:00
mwerezak
ac0e3966d6 Taser cleanup and fixes 
Fixes cloaking devices and deadman switches being included in taser code
somehow.

Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
 2014-08-03 15:47:21 -04:00
ZomgPonies
fef301062e Boop 2014-08-03 15:42:27 -04:00
mwerezak
0dc07bafa1 Stun baton nerf 
Adds agonyforce var to stun batons, which causes halloss and eye blur.

Also did some clean up of stun batons, and fixed the stun baton's bcell
var being of type weapon/cell/high instead of weapon/cell.

Conflicts:
	code/_onclick/item_attack.dm
	code/game/objects/items/weapons/stunbaton.dm
 2014-08-03 15:40:19 -04:00
Whitellama
8c27a4e092 Wet rag no longer makes noise or hits when wiping down windows (nor does anything with the NOBLUDGEON flag) 2014-08-03 15:28:36 -04:00
Rob Nelson
7832e1c26f PLASMA MAAAAAAAAAAAAAAAAAAAAAAAN 
Conflicts:
	.gitignore
	baystation12.dme
	code/_onclick/hud/screen_objects.dm
	code/modules/clothing/spacesuits/alien.dm
	code/modules/media/tapedeck.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/species.dm
	html/changelog.html
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/in-hand/in-hand_sync_report.txt
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/tank.dmi
 2014-07-31 18:58:49 -04:00
SamCroswell
94dbad82a4 Alien Tweaks, Commented Out Detomatix 2014-07-30 00:53:56 -04:00
ZomgPonies
89508f7e7f Merge pull request #334 from Bone-White/master 
Advanced Medical Hud Glasses (medihud + flash protection)
 2014-07-27 11:58:42 -04:00
Bone White
abde4759ae Advanced Medical Hud Glasses (medihud + flash protection) 
For blueshield and brig physician.  Also added the item to blueshield
locker.  Item allows medical record viewing/editing.  I have _NOT_ added
security record viewing/editing.
 2014-07-27 16:06:35 +01:00
Zuhayr
c0ba021bcd Added portable_atmospherics to hydroponics machine path, couple of other tweaks. 
Conflicts:
	code/datums/supplypacks.dm
	code/game/machinery/hydroponics.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/reagents/reagent_containers/spray.dm
	maps/tgstation2.dmm
 2014-07-26 14:03:46 -04:00
ZomgPonies
03f116b8a4 Compile fix 2014-07-26 11:34:50 -04:00
DJSnapshot
b61a4d837f fix to allow non-humans to be stunned like they should be. Gosh. (Also, clumsy check and making harmbaton actually work) 
Conflicts:
	code/game/objects/items/weapons/stunbaton.dm
 2014-07-26 11:31:40 -04:00
Walter0o
843d603a0b fixes nullpointer caused by broken organ list pt 2 
more a prevention than a fix, but meh
Conflicts:
	code/game/objects/items.dm
 2014-07-26 11:26:09 -04:00
Rob Nelson
2873262a07 Recoded wall-smoothing for optimization. Fixes #835. 
Conflicts:
	code/game/smoothwall.dm
	code/game/turfs/simulated/walls.dm
	code/modules/power/singularity/singularity.dm
 2014-07-25 16:29:00 -04:00
ZomgPonies
bf19e7ac73 PDA investigate fix 2014-07-25 13:52:57 -04:00
ZomgPonies
dc56dc8958 Investigate PDA messages 2014-07-25 12:32:35 -04:00
ZomgPonies
b33df4745c Removed deprecated power generation stuff (AM, RUST) to free up more procs 2014-07-25 11:33:37 -04:00
Zuhayr
ebb9f724aa Hydroponics rewrite, details will be in PR. Big commit. 
Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/game/gamemodes/events/spacevines.dm
	code/game/machinery/seed_extractor.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/mob.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/food/snacks/grown.dm
	icons/obj/hydroponics.dmi
	maps/tgstation2.dmm
 2014-07-25 11:10:01 -04:00
Rob Nelson
09743b6235 More burnable shit 
Conflicts:
	code/game/turfs/simulated/floor_types.dm
 2014-07-24 21:07:32 -04:00
Rob Nelson
72750a7731 Get rid of burning and burn_point since they're now redundant. 2014-07-24 21:02:29 -04:00
ZomgPonies
8fc1cc3024 Remove RadioChatter toggle as redundant and broken. Ghosts can use GhostRadio toggle while players can turn off their headsets ICly. 2014-07-24 16:35:22 -04:00
ZomgPonies
6b0cee85b0 Spearbug 2014-07-23 15:50:33 -04:00
ZomgPonies
dc38069dd4 Merge pull request #319 from Bone-White/master 
Added secrets - bomb log for more explosives
 2014-07-23 14:45:25 -04:00
Bone White
d355956062 Added secrets - bomb log for more explosives 
Chem grenades, ghetto grenades and standard grenades added.  All log on
priming but not explosion.
 2014-07-23 19:02:47 +01:00
ZomgPonies
f2ecd1503b Completed adding Kidan Ambassador decorations 2014-07-23 13:24:51 -04:00
ZomgPonies
14b7c17b6a Spider nerf 2014-07-22 15:11:03 -04:00
Necaladun
467c289cc2 Removed gun and armour from HoP closet 
Removed egun, helmet and armour from HoP because they are NOT sec.
 2014-07-22 18:48:49 +09:30
Rob Nelson
ee5d2c8a1c Trash autoignition 
Conflicts:
	code/game/objects/items/trash.dm
 2014-07-20 10:59:44 -04:00
Whitellama
c231899b05 Eating with utensils now produces the eating sound, fixed #5687 2014-07-20 05:56:06 -04:00
ZomgPonies
01ce1db6ff Fix drag and drop climbing, finally 2014-07-18 17:35:35 -04:00
ZomgPonies
c5dac036e1 Fix drag and drop table climbing 2014-07-18 13:04:41 -04:00
Zuhayr
3098c80f9c Fixed some bugs, did some testing, moved some procs around for robot functionality. 
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
 2014-07-18 07:38:11 -04:00
Zuhayr
bdfc7ef719 Added Crisis and Surgeon modules, removed Medical module, added Construction module, altered Mining and Engineering modules. 
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
 2014-07-18 07:30:54 -04:00
Walter0o
08c5cdb736 should fix #5618, trivial kitchen utensil bug 2014-07-18 06:58:47 -04:00
Rob Nelson
f7b516a5ab Shit catches on fire now 
Conflicts:
	code/ZAS/Fire.dm
	code/game/objects/items/weapons/storage/bible.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/modules/mob/living/living_defines.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/photography.dm
	code/setup.dm
 2014-07-18 06:32:15 -04:00
VampyrBytes
34712ecc37 Fix for internal organ surgery 
Fixes internal organ surgery, and some other places where the same
problem would have cropped up
 2014-07-16 20:17:50 +01:00