DZD
6180243d65
Minor changes
...
- Changes asteroid wall sprites.
- Gives miners a styptic patch.
- Removes code that was previously commented out related to the
stationary mining drills.
2015-07-28 13:07:24 -04:00
DZD
d64568e309
Adds the can_charge var to energy guns
...
If set to 0, makes it so the gun cannot be charged in recharges. Set to
1 by default, only the nuclear (AKA advanced) egun and both plasma
cutters have it set to 0. (Nuclear egun was previously unable to be
charged, but used an istype check specific to it.)
2015-07-24 16:02:13 -04:00
DZD
66688f4dbb
Fixes conflicts in icons/obj/gun.dmi.
2015-07-24 15:29:20 -04:00
Fox-McCloud
0945859066
Merge pull request #1554 from Markolie/master
...
Fix OneHuman law
2015-07-22 16:57:23 -04:00
Markolie
4cfd1e4340
Fix OneHuman law
2015-07-22 18:35:09 +02:00
SamCroswell
d84dfe5a49
ERT Rework - Code Changes
2015-07-20 19:37:56 -04:00
TheDZD
8f2f2cb0a5
Merge pull request #1544 from Fox-McCloud/oh-no
...
Fixes Blob Self Replication
2015-07-19 17:15:02 -04:00
Fox-McCloud
0990a4ec5e
Fixes Blob Self Replication
2015-07-19 15:50:27 -04:00
Fox-McCloud
4bae3f073b
Reduces Blob's Lag
2015-07-19 09:56:38 -04:00
Fox-McCloud
865d828976
Merge pull request #1538 from SamCroswell/ComputerFixes
...
Computer Fixes
2015-07-17 23:49:56 -04:00
SamCroswell
355666e1a8
Computer Fixes
2015-07-17 22:35:00 -04:00
Fox-McCloud
df9ca1564d
Fixes Immortal Blobbernaughts
2015-07-17 09:52:49 -04:00
TheDZD
fbbceac377
Merge pull request #1499 from Fox-McCloud/blob-update
...
[Ready To Merge!]Blob Mode Major Overhaul
2015-07-16 20:34:08 -04:00
Fox-McCloud
ca784c3772
Merge pull request #1530 from CrAzYPiLoT-SS13/master
...
Holopad and binary talk
2015-07-16 19:37:38 -04:00
Markolie
50210c6ff2
Enable malf AI jobbans
2015-07-17 01:06:05 +02:00
Markolie
0be9055d58
Fix Malf AI
2015-07-17 01:00:25 +02:00
Matt
a106daa447
Holopad and binary talk
...
Fixes https://github.com/ParadiseSS13/Paradise/issues/1517 and
https://github.com/ParadiseSS13/Paradise/issues/1483 Aboot it
2015-07-16 14:44:51 +02:00
Fox-McCloud
8f89792c2a
preventative measures
2015-07-16 03:00:40 -04:00
Fox-McCloud
5740d2e945
runtime fix
2015-07-16 01:26:20 -04:00
DZD
29e70854e9
Fix merge conflicts
...
🖕 map conflicts over lines that weren't even edited by both upstream
and this branch.
2015-07-15 22:28:12 -04:00
TheDZD
0ff97aa42e
Merge pull request #1522 from Fox-McCloud/fixin-dat-thing
...
Power Computer and Computer Fixes
2015-07-15 19:43:59 -04:00
Fox-McCloud
04204c2d30
forgot a thing
2015-07-15 18:35:29 -04:00
PJB3005
2b0ea0524f
gotta go fast!
2015-07-15 17:22:56 +02:00
Fox-McCloud
409fefa4b3
Power Computer and Computer Fixes
2015-07-15 07:00:46 -04:00
Fox-McCloud
da8ac741e9
Merge pull request #1510 from Krausus/FurtherTrayedStructureFixes
...
Further Morgue & Crematorium Fixes
2015-07-14 19:56:56 -04:00
TheDZD
09c5c9d8f5
Merge pull request #1503 from Fox-McCloud/more-explosion-tweaks
...
More Explosion Optimizaitons
2015-07-14 17:33:07 -04:00
Krausus
8e753ac1a6
Removes redundant timestamp
2015-07-14 04:18:35 -04:00
Krausus
6376907560
Further fixes to morgues and crematoriums
2015-07-14 04:08:56 -04:00
Fox-McCloud
a493b99560
Merge pull request #1501 from TheDZD/transform-sting-a-shit
...
Changeling Sting Nerfs/changes/tweaks
2015-07-14 02:18:43 -04:00
Krausus
5d342baffb
Fixes morgues and crematoriums (includes resisting)
...
Fixes their trays breaking for 30 seconds, not logging cremations, not
being able to resist out of them, and all these damn uses of src.
2015-07-13 07:31:48 -04:00
Fox-McCloud
5a0db0e3ee
More Explosion Optimizaitons
2015-07-13 04:32:58 -04:00
Fox-McCloud
3cea808dee
fixes again
2015-07-12 23:45:20 -04:00
ZomgPonies
5d094585e5
Merge pull request #1497 from Fox-McCloud/auto-toggle-ooc
...
Auto-Toggling OOC
2015-07-12 22:36:06 -04:00
ZomgPonies
f4ea821829
Merge pull request #1496 from Fox-McCloud/LINDA-Pressure
...
LINDA Pressure Changes
2015-07-12 22:35:21 -04:00
Fox-McCloud
71d2557f78
runtime+bug fix
2015-07-12 22:26:52 -04:00
Fox-McCloud
b808e67bcd
oops
2015-07-12 20:25:18 -04:00
Fox-McCloud
a1b56cd4a0
adjustments
2015-07-12 18:46:13 -04:00
Fox-McCloud
a1c0a9ce70
fixes
2015-07-12 18:06:48 -04:00
DZD
0eeed99460
Changeling sting nerfs/changes/tweaks
...
- Prevents transform sting from working on species with NO_BLOOD.
- Prevents DNA extraction sting from working on species with NO_BLOOD.
- Prevents Plasma Men from being changelings, largely for the same
reason Slime People can't be changelings, horribly mutilating people
with transform sting.
(Alternative way to do this would be for a species check in the DNA
sting's Click() proc, which is horrendous because DNA does not contain a
species datum, just a string with the species' name.)
- Ported some nerfs from tgstation/-tg-station#10482 , transform stinging
somebody is no longer silent. It won't point you out specifically, but
it will create a visible message for everyone in view range, and will
make the person jittery. Also forces a cooldown on the use of all
changeling powers.
- Re-enables cryo sting. This should now be working since mob
temperatures were fixed a while ago.
2015-07-12 13:08:56 -04:00
Fox-McCloud
ddd4f1b196
round end stats
2015-07-12 07:57:43 -04:00
Fox-McCloud
ef98b9ecb7
fixes spoken blob text
2015-07-12 06:27:44 -04:00
ZomgPonies
2e2d8794b8
Merge pull request #1498 from Fox-McCloud/security-helmets
...
Re-adds Security Helmets to Officer's Lockers
2015-07-12 06:13:57 -04:00
Fox-McCloud
04511d3f0b
Blob Mode Major Overhaul
2015-07-12 02:45:40 -04:00
Fox-McCloud
898bcea1e8
Merge pull request #1489 from FalseIncarnate/master
...
Kitchen Machine Refactor and Max Item fix
2015-07-11 22:19:07 -04:00
TheDZD
90026bdec2
Merge pull request #1493 from Fox-McCloud/just-stop
...
Changes a few del to del()
2015-07-11 21:46:22 -04:00
Fox-McCloud
057c15982e
Re-adds Security Helmets to Officer's Lockers
2015-07-11 10:10:57 -04:00
Fox-McCloud
e5ee234292
Auto-Toggling OOC
2015-07-11 09:38:20 -04:00
Fox-McCloud
99bf49504a
LINDA Pressure Changes
2015-07-11 06:28:03 -04:00
FalseIncarnate
ec2aab62ef
Z5 revert / compatibility,
2015-07-11 03:28:07 -04:00
Fox-McCloud
f5ce957f33
qdel pass II
2015-07-11 02:10:31 -04:00
