cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-15 03:52:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,113 Commits 27 Branches 2 Tags
bf3d3cf04a1fc99285b0452dfba5df42e2ca8608
Commit Graph

7501 Commits

Author SHA1 Message Date
GinjaNinja32
bf3d3cf04a Use absolute paths 2014-08-16 21:44:27 -04:00
GinjaNinja32
52b0de9928 Use \the macro 2014-08-16 21:44:10 -04:00
GinjaNinja32
0427641d89 Moved all shard code to one file. Fixed #5992 
Conflicts:
	code/defines/obj/weapon.dm
	code/game/objects/items/stacks/sheets/glass.dm
 2014-08-16 21:43:38 -04:00
mwerezak
ab0f0db923 airlock/arePowerSystemsOn() refactor 
airlock/arePowerSystemsOn() now checks if the airlock has power in
addition to the wires being intact.

Conflicts:
	code/game/machinery/doors/airlock.dm
 2014-08-16 21:34:30 -04:00
mwerezak
e44dbfcc4e Fixes #5953 
Conflicts:
	code/game/machinery/doors/airlock.dm
 2014-08-16 21:30:47 -04:00
ZomgPonies
4567a6d607 WTF in world 2014-08-16 21:29:15 -04:00
Lancer411
72aac48662 Checks for SMES Z level at power_failure.dm 
Little fix which checks Z level of SMES before drying it up at grid_check event.
 2014-08-16 21:27:35 -04:00
Lancer411
b2acb96393 Fixes for grid_check random event. 
There was an issue, when APC with removed cell in area was powered at power_restore() proc, making area allways powered despite APC was not working.
Removed part of code which unpowers area directly, bypassing the APC process code. This makes grid_check event less laggy and smooth. Downside is lights not being shut down immediatly.
AI SMES still not being affected after this fix.
Conflicts:
	code/game/gamemodes/events/power_failure.dm
 2014-08-16 21:27:26 -04:00
Ccomp5950
3ca02d3c5b Fixed the font tag on mouse traps description. 
Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
 2014-08-16 20:53:29 -04:00
Bone White
140db57ba4 Adds a sound when nations mode is announced 
Not tested because I can't force nations without server pop.
 2014-08-16 22:09:49 +01:00
Bone White
d882485376 T-Ray scanner var improvement 
Allows tray scanner range and pulse duration to be controlled by vars.
Added three upgraded tray scanners, with increased range, increased
pulse duration, and both of these features.
 2014-08-16 08:46:48 +01:00
ZomgPonies
6c25320a71 Merge pull request #378 from Bone-White/master 
New icon for pipe freezer
 2014-08-11 21:09:41 -04:00
Bone White
69122ab55e New icon for pipe freezer 
icon by pancakeflipper
 2014-08-12 02:04:07 +01:00
ZomgPonies
e08fb5d1d0 Merge pull request #377 from Bone-White/master 
Further atmos changes
 2014-08-11 20:38:52 -04:00
ZomgPonies
2feedafaae Merge pull request #375 from VampyrBytes/master 
couple of fixes
 2014-08-11 20:38:11 -04:00
Bone White
ea1feb41dd Further atmos changes 
mixers and filters no longer have density = 1, so mobs can walk over
them.
new item: pipe freezer, can temporarily freeze pipes to allow
unwrenching when over the threshold internal pressure
note: has a temporary skin of hand labeler, needs a new sprite really.
 2014-08-11 17:45:18 +01:00
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
VampyrBytes
896021c967 couple of fixes 
fixes MP's ending up with 2 heads on death
fixes cloning machine cloning species that are meant to be uncloneable
 2014-08-10 11:11:21 +01: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
c0378f1434 Added: Pill bottle emptying into fridge 
- Drag pill bottle sprite onto fridge to empty it

Code for batch filling of fridge is re-used from similar uses of plant
bag and ore bag.
 2014-08-09 04:36:37 +02:00
Artorp
32d14b8307 Medical belt can load into fridge 
- Fixed compiling error with glass.dm

- Medical belt will load apropriate items into the medical fridge when
used on the fridge
 2014-08-09 03:18:31 +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
Jeremy Liberman
a4196cb745 Add Vox Heist directive and call shuttle on completion of Directive X 
Conflicts:
	baystation12.dme
	code/controllers/emergency_shuttle_controller.dm
	code/modules/mob/mob.dm
 2014-08-06 23:12:24 +02:00
ZomgPonies
5b04ef3385 Merge pull request #355 from Bone-White/master 
Pipe wall drilling fix
 2014-08-05 20:34:01 -04:00
Bone White
00e982db79 Miner Drills spawn on belt 
This is to fix a bug with races which spawn with a bag in their hand
overwriting the drill.
 2014-08-05 14:43:32 +01:00
ZomgPonies
3fe9e49bb2 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-08-04 22:16:23 -04:00
Graham Lloyd
2c4e98a726 Fireaxe cabinet hacking now fails if player moves away 2014-08-04 22:15:12 -04:00
Necaladun
4676a44e9e Minimum age for IAA 
because i'm sick of shitty IAA with laser pointers.
 2014-08-05 07:25:14 +09:30
Bone White
d1218e38bb Pipe wall drilling fix 
Fixes the var/dir of the bent pipes when drilling into walls
 2014-08-04 12:28:26 +01:00
ZomgPonies
9df399b745 Fix remote view and remote talk 2014-08-04 02:47:27 -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
ZomgPonies
9d5d12b53c Merge pull request #353 from Bone-White/master 
Slide pipes along floors
 2014-08-04 01:01:16 -04:00
ZomgPonies
6ac92ebe19 Boops 2014-08-03 23:42:00 -04:00
ZomgPonies
85045ef281 Fix incendiary heh 2014-08-03 23:41:35 -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
mwerezak
e76cc064df Fixes siemens_coefficent not affecting shock damage 
Also cleans up electrocute_act()

Conflicts:
	code/game/gamemodes/events/ninja_equipment.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/human.dm
 2014-08-03 15:24:53 -04:00
Walter0o
570fd2756b robot computer emagging exploit fix 
so an emagged borg can in turn emag all others ?
the more you know.
seems extremely OP to me but i am just closing the exploit, not changing the game.
Conflicts:
	code/game/machinery/computer/robot.dm
 2014-08-03 15:06:16 -04:00