Commit Graph

7991 Commits

Author SHA1 Message Date
oranges
829243360d Merge pull request #18489 from Core0verload/ce_jetpack
Brings back CE's hardsuit jetpack
2016-06-15 10:44:59 +12:00
oranges
9c451faa2c Merge pull request #18534 from Core0verload/ash_fix
Fixes unkillable ash drake (+ more runtime fixes)
2016-06-15 10:44:20 +12:00
lordpidey
f640d7ddb7 Devil fixes (#18520)
Numerous small fixes/changes/balances to devils.

Notable changes:
It now requires more souls to increase. It is now 3,7,12 souls, up from 3,6,9.
Devils now have extra rules, no coercing into signing contracts with violence, and no intentionally physically harming another devil.
Burial garment banishment now works on true devils. <--- Unreported issue, can I use that fix for the mergetoken?
Renamed all demon files to devil
Updated religious supplies to have burial garments.
Burial garments re-added to box/meta
Increased infernal fireball cooldown
Soulsellers can now use a pitchfork without being harmed.
Added new book crate, which includes a codex gigas to cargo.
2016-06-14 15:43:33 +12:00
oranges
4c67fca7ea Merge pull request #18529 from ChangelingRain/firsttrueuseofsetDir
Chairs now handle layer updates/rotation with setDir
2016-06-14 15:24:47 +12:00
oranges
ec50fbdc9f Merge pull request #18499 from tgstation/RemieRichards-infbuckle
Fixes infinite buckling, removes unnecessary list init.
2016-06-14 09:23:30 +12:00
oranges
0ec02030c8 Merge pull request #18515 from ChangelingRain/clockworkpower
Clockwork airlocks and windoors are always powered
2016-06-14 09:23:06 +12:00
Joan Lung
59b26e9715 properly 2016-06-13 09:43:01 -04:00
Joan Lung
63998cb55d Can't use door remotes on doors you can't use 2016-06-13 08:30:00 -04:00
c0
9fdbe269d6 More fixes 2016-06-13 12:43:25 +03:00
Joan Lung
8582d0fbbd Chairs now handle layer updates/rotation with setDir 2016-06-12 22:56:41 -04:00
oranges
eb30d5c84e Merge pull request #18242 from LatD/machineprototype
Item to cargo for R&D engineering tech
2016-06-13 14:08:05 +12:00
Razharas
89649091cd Merge pull request #18482 from ChangelingRain/sigilofcession
Nerfs Sigils of Transgression/Submission
2016-06-13 00:37:29 +03:00
oranges
d7c748a558 Merge pull request #18472 from phil235/HackyShit
Fixes Synths
2016-06-13 09:24:52 +12:00
Remie Richards
87bba48cb5 Fixes infinite buckling, removes unnecessary list init. 2016-06-12 14:35:14 +01:00
Joan Lung
84a6edf527 Merge branch 'master' of https://github.com/tgstation/tgstation into gratuitouspenetration
Conflicts:
	icons/effects/blood.dmi
2016-06-12 08:37:13 -04:00
oranges
99620ffe76 Merge pull request #18481 from phil235/PlantsGunsShit
Moving code around
2016-06-13 00:14:29 +12:00
oranges
b20a5642de Merge pull request #18473 from RemieRichards/setDir()
Set dir()
2016-06-13 00:03:44 +12:00
oranges
a37b08c53d Merge pull request #18449 from xxalpha/fucklizard
L A R G E Graffiti YIFF IN HELL AND OTHERS
2016-06-13 00:00:33 +12:00
oranges
e594dc34ff Merge pull request #18462 from Niknakflak/MUSIC_AND_GUITARS_AND_STUFF_SHREDDING_YEA_FUCKING_FIXES_YEA_SOUND_WOO
Add an electric guitar and removes duplicate guitar sound files
2016-06-12 23:58:10 +12:00
Jordie0608
0846d6f30d fixes fire logging bracket 2016-06-12 20:58:55 +10:00
c0
b615fb504f Brings back CE's hardsuit jetpack 2016-06-12 09:18:39 +03:00
Remie Richards
b3b60b187b Manual repair of some edge cases. 2016-06-11 23:11:54 +01:00
Joan Lung
5299df729b Nerfs Sigils of Transgression/Submission 2016-06-11 17:45:05 -04:00
phil235
3b8af6f5ff Fixes grille/New() not calling ..()
Blood drips icons are now in blood.dmi instead of drip.dmi (which only had the 5 drip sprites).
Moved projectiles, guns, casings and ammo boxes to be in the right files. Please don't put your gun with its projectile, ammo casing and ammo box all the same file.
I split growing.dmi into 5 smaller files so we don't get close to the 512 icon limit again. Each seed has a var to indicate which icon file to use when planted.
Fixes code for heavy pulse laser projectile to be less awful.
2016-06-11 23:18:26 +02:00
Remie Richards
fda2c699fc Automatic conversion via Regex 2016-06-11 18:37:48 +01:00
xxalpha
aa61810083 var name 2016-06-11 17:49:22 +01:00
phil235
9e5e525335 Fixes admantine golem female body icon. Now all golems have a female version.
The wizard can no longer choose to become a military synth.
2016-06-11 17:13:12 +02:00
xxalpha
ffc5bb5402 Better looking sprites and bug fixfsjasf 2016-06-11 16:01:30 +01:00
Jordie
0777916328 Merge pull request #18402 from optimumtact/flamingfunremoval
Better logging and notification of setting on fire
2016-06-11 23:53:34 +10:00
oranges
bf9643563d Ensure we only log and notify admins when person is set on fire
This takes advantage of the now refactored IgniteMob returning true when
it successfully ignites the mob
2016-06-11 13:08:05 +00:00
NikNakFlak
5dd2785699 Add an electric guitar and removes duplicate guitar sound files 2016-06-10 20:07:47 -07:00
Joan Lung
aed28cafb8 Ratvarian spears can now be used to impale humans 2016-06-10 18:20:04 -04:00
oranges
ab73b4569a Merge pull request #18413 from phil235/FixAssortment1
Fives Fixes
2016-06-11 10:05:35 +12:00
xxalpha
9898f948b7 LARGE GRAFFITI 2016-06-10 22:31:38 +01:00
LatD
82e100ba43 Fix origin tech 2016-06-10 23:05:05 +03:00
LatD
d95a6abd29 Correct icon state 2016-06-10 23:04:35 +03:00
LatD
fa22cf4449 Add icon state 2016-06-10 23:03:57 +03:00
LatD
40590d2b6a Add filepath 2016-06-10 22:44:02 +03:00
oranges
db05d6939e Merge pull request #18399 from bgobandit/stopfuckingbumpingmeyoufuckshit
Interrupted drawings will not affect the text buffer.
2016-06-10 15:58:53 +12:00
Joan Lung
4b9c4c7adb Merge pull request #18394 from lzimann/stools2
Bar stool no longer becomes a normal stool and are now constructables
2016-06-09 22:01:19 -04:00
oranges
fc23d8464c Merge pull request #18386 from hornygranny/patch-8
fixes godhand not deleting on drop
2016-06-10 11:51:17 +12:00
Razharas
4b7d83be77 Merge pull request #18375 from ChangelingRain/gearhud
Makes cyborg ratvar conversion work properly
2016-06-09 22:43:54 +03:00
phil235
219639e00b Using a multitool on telepad with open panel to save data no longer hits the machine.
Packagewrapping a pulled item now properly stops the pulling.
Using put_in_hands() procs now properly checks if the mob has a hand.
bodyparts icon_state is now "" like it should be.
You can no longer build a firelock on top of another firelock.
You can reinforce a firelock assembly to build a heavy firlock.
Human species who breath something other than oxygen now get the proper alert when in crit, and I fixed the alert not being removed when healed.
2016-06-09 20:46:00 +02:00
Joan Lung
8d2da45e8c duh 2016-06-09 08:39:16 -04:00
Joan Lung
c5ee14a0e3 gotta emag the borg 2016-06-09 08:21:24 -04:00
nullbear
98ee507de8 Adds noteleport variable
This is mostly a pre-setup for my greater-bag-of-holding stuff.

You can't use bluespace crystals/jaunters/hand teleporters to access bluespace-proofed areas. at the moment, this only applies to shuttles and centcomm.

Teleport beacons placed in bluespace proofed rooms can't be teleported to, except via teleporter station hub.

A little concerned because now 'hijack' antags cant use teleprods to fling everyone out of the shuttle while in transit. q_q could easily just make the shuttle non-bluespace proof though.

Note for mappers: This means you can create ruins that can't be teleported into using bspace crystals by setting the area "noteleport" to 1. This can be used to force players to travel through the ruin the way they're intended to. Or to prevent them from gaining access to areas they shouldnt normally be able to. (ie. the wishgranter ruin)
2016-06-09 20:33:25 +12:00
oranges
59b72ec25c Better logging and notification of setting on fire
This also logs bump fire to the gamelog incase someone ever needs to
find out who set who on fire with bumping (left out of admin
notification) as it would be very spammy
2016-06-09 06:31:23 +00:00
oranges
c143e30ab5 Merge pull request #18350 from GunHog/AshTreaders
Mining Cyborg Ash Storm Plating Upgrade
2016-06-09 15:46:06 +12:00
oranges
a08cff21f0 Merge pull request #18345 from TechnoAlchemisto/glass_bottles_don't_break_on_heads_as_easily_as_in_the_movies_I_would_know
Renames and relores loyalty implants to mindshield implants.
2016-06-09 15:39:53 +12:00
oranges
4af9392f01 Merge pull request #18333 from KorPhaeron/charter
Captain's Charter/Captain can name the station
2016-06-09 15:39:41 +12:00