Commit Graph

1791 Commits

Author SHA1 Message Date
skull132
7be87fce5d Baton Buff
Should near-insta stun normal people now.
2016-02-02 14:56:01 +02:00
skull132
69e355fe9f Sec Related Tweaks
* Tasers are projectiles once more.
* Handcuffs don't need level 2 grab to work.
2016-02-01 18:59:02 +02:00
skull132
205ed7ed42 Merge remote-tracking branch 'origin/just-in-case'
# Conflicts:
#	code/game/objects/items/weapons/weaponry.dm

Conflict clearance for vampire.
2016-01-28 01:32:20 +02:00
skull132
4c0867c922 Merge pull request #22 from Ryan784/Lawgiver-1.0
Lawgiver
2016-01-24 23:12:44 +02:00
skull132
2bded92969 Merge pull request #10 from Ryan784/Welder-Bomb-Delay
Welder bomb delay
2016-01-24 23:11:41 +02:00
skull132
de8728986a Merge pull request #8 from Ryan784/Null-Rod-Conversion
Null rod conversion
2016-01-24 23:11:36 +02:00
skull132
df009a3307 Merge pull request #3 from skull132/telescience-import
Telescience import
2016-01-24 23:11:09 +02:00
Ryan784
5f655dbbdb Vampire Gamemode Developement Test
The Vampire gamemode, as ported right now. The gamemode is in, as well
as creating a vampire through the traitor panel. All abilities seem to
function, unable to test enthrall however (though I have a feeling it
will have to be redone). Enthralling someone without a CKey will give
you the correct response, however.

Any abilities having to do with lums will need to be redone. Vamphud as
well.

If looking over this and pointing out errors/fixing is faster than
simply porting it yourself, then feel free to do so!
2016-01-20 22:14:21 -05:00
Lord Lag
ee583b913d Vaurca Update
Vaurca for ne code, now with better sprites
2016-01-20 19:50:19 +00:00
Ryan784
92c1ab268c Lawgiver reinstated
Adds back in Lawgiver, the lawgiver lockbox and the ability to create
them in research.
2016-01-14 16:54:26 -05:00
Ryan784
10765a4fad Welder Bomb delay 2.0
This time without message_mods!
2016-01-13 09:39:53 -05:00
Ryan784
f1e8e45777 Welder Bomb Delay
Adds a delay to welder-bombing, and alerts mods/admins.
2016-01-12 22:48:18 -05:00
Ryan784
5d6afbf749 Null Rod Conversion
Null Rod conversion is no longer instantaneous, just like with
conversion a Cult Member will have the option to resist.
2016-01-12 18:48:47 -05:00
Sebastian Broberg
90f27ca42c Fixes chemgrenades
Fixes #11686
2015-12-23 23:46:53 +01:00
Spamcat
905070bc96 \the 2015-12-16 20:30:26 +03:00
Spamcat
8df6ee3318 \red >> styles 2015-12-16 20:21:10 +03:00
Spamcat
485a2fdd45 Made kitchen utensils less dangerous.
#11370
2015-12-16 20:07:35 +03:00
SkyMarshal
415f78ee18 Chem grenades are no longer melted by acid.
Fixes #10478
2015-12-12 16:29:05 -07:00
Zuhayr
c2eba995ac Merge pull request #11604 from mwerezak/organ-tag-fix
Organ fixes
2015-12-07 19:13:09 +10:30
HarpyEagle
93233b6dd9 Adds soap wetting log message 2015-12-06 14:03:33 -05:00
mwerezak
9135a609cb Replaces most instances of if(E & ORGAN_DESTROYED) with if(E.is_stump()). Fixes #11468 2015-12-06 04:17:52 -05:00
mwerezak
87648e86ef Fixes runtime when cleaning turfs with soap
Partial fix of #11490
2015-12-06 02:00:50 -05:00
mwerezak
b12e094112 Removes unreachable return in organ/external/remove(), smaller embedded items are no longer deleted. Implants changed to w_class 1 because seriously a w_class 3 implant makes no sense at all. 2015-12-05 23:38:57 -05:00
PsiOmegaDelta
ab2ddfcba7 Atmospheric computer circuit additions.
Adds several missing variables used in the construction and deconstruction set of gas management computers. Fixes #11392.
Computers also no longer attemps to qdel a type on Destroy()
2015-10-29 16:55:58 +01:00
PsiOmegaDelta
e79e82f55d Gives replacement light boxes the same fitness treatment. 2015-10-15 10:42:51 +02:00
PsiOmegaDelta
fd03e4d59b Surgical kits can now contain their equipment.
The surgical kit can now contain the equipment it came with. It can also not contain more items of a given type than it was spawned with.
This means that even if the storage container otherwise has sufficient space it can, for example, still only ever contain 1 surgical saw.

Fixes #11298. Fixes #11297.
2015-10-15 10:20:49 +02:00
Chinsky
debe69aa80 Merge pull request #11268 from PsiOmegaDelta/151010-LessHolographicHoloComputer
Fixes #11263.
2015-10-10 17:51:15 +03:00
PsiOmegaDelta
fd3370c01f Fixes #11263.
Now possible to use items other than emags on holodeck computers
Blobs no longer make computers lose their density state.
Holodeck computers can now be repaired (and built, but since they cannot be configured they'll be useless).
Fixes #11263.
2015-10-10 10:11:48 +02:00
GinjaNinja32
d5928d9927 Merge pull request #11260 from mwerezak/ttv
Fixes TTV Yield
2015-10-10 09:05:00 +01:00
HarpyEagle
fa661f998f TTV Refactor
Ensures TTV icon update occurs properly and removes the need for sleep() by
updating tank Destroy() to account for TTVs. Collects duplicated code into
a transfer_valve/remove_tank() proc.
2015-10-08 23:26:05 -04:00
skull132
50fa97c01b File modification 2015-09-17 13:56:04 +03:00
Kelenius
baebd62c26 Fixes tank examine() 2015-09-15 10:14:07 +03:00
Kelenius
3c4369823f Fixes for jetpacks
Jetpacks now GC; CO2 jetpacks no longer pointlessly create a datum that
is already created in the parent; CO2 jetpacks can be properly examined;
removes text() and adds spans and \the.
2015-09-14 16:35:52 +03:00
Zuhayr
88b95e1207 Fixes #7951 2015-09-07 14:40:23 +09:30
PsiOmega
22262507b9 Only living mobs now trigger shrapnel.
Fixes issue with manually moving ghosts would step on shrapnel, with glass noise and all.
On dev this issue is expanded further as all known movements means use forceMove.
2015-08-29 10:03:58 +02:00
mwerezak
cfa8ab3fd0 Removes bear traps from the custodial closet, adds autolathe recipe 2015-08-22 02:31:19 -04:00
Snapshot
5f5671d21f Merge pull request #10647 from mwerezak/acids
Fixes #10645
2015-08-14 22:22:41 -07:00
mwerezak
133bc96344 Fixes #10645
Sets unacidable where appropriate.
2015-08-14 23:20:10 -04:00
PsiOmegaDelta
d1e8f670b2 qdel(reagent) adjustments.
Attempts to ensure qdel(reagents) only occur once per Destroy()
2015-08-13 10:26:31 +02:00
Chinsky
0e52b3d4df Merge pull request #10562 from PsiOmegaDelta/150812-OneCrew
Fixes the One Crew Member module.
2015-08-12 20:38:52 +03:00
HarpyEagle
a62edc5b3a Fixes #10548 2015-08-12 12:21:28 -04:00
PsiOmegaDelta
249db0b03d Fixes the One Crew Member module.
Didn't return properly in install().
Override transmitInstructions() when addAdditionalLaws() was more than sufficient.
2015-08-12 14:42:52 +02:00
Chinsky
7b1656f40c Merge pull request #10470 from Karolis2011/dev-freeze
[Dev-Freeze] Replace \red with <span> in runes.dm, fix many "his/her/their" gender messages
2015-08-11 20:07:06 +03:00
SomeoneElse
8c0984d5b1 Fix gender issues, some typos from various files 2015-08-11 13:41:40 +03:00
Kelenius
1324e69a19 Fixes #10466 - chem implant can't be loaded
What the literal shit.
2015-08-11 10:26:22 +03:00
HarpyEagle
fc7e89380e More material renames
Gives several materials shorter and easier to type names, updating the
display_name where applicable. Also fixed a slightly mismatched variable
type.
2015-08-07 17:10:35 -04:00
mwerezak
0ceb0e291d Fixes #10314
Replaces every check for a hardcoded material stack type with a check
for material of the stack.
2015-08-02 00:01:10 -04:00
mwerezak
e3609bac94 Adds common proc to obtain the material of an object
Adds a common get_material() proc to objects, and implements overrides
where applicable
2015-08-01 23:03:21 -04:00
Zuhayr
ad63247749 Merge pull request #10382 from Mloc/freezyfixes
fixes
2015-07-31 03:55:34 +09:30
Zuhayr
64ccd8a048 Merge pull request #10269 from Mloc/lightwrite
lighting work
2015-07-27 11:41:14 +09:30