Fox McCloud
f28285e16f
further checks
2018-04-30 04:42:57 -04:00
tigercat2000
3c1fbf9cc5
Merge pull request #8938 from Fox-McCloud/guillotine
...
Ports Guillotine
2018-04-29 20:28:50 -07:00
Fox McCloud
63e2a175fd
Merge remote-tracking branch 'upstream/master' into timer-subsystem
2018-04-29 21:14:11 -04:00
tigercat2000
4f39ee73c8
Merge pull request #8936 from Fox-McCloud/tg-blast-cannon
...
Ports TG's Blastcannon
2018-04-29 18:13:16 -07:00
tigercat2000
2163e43b53
Merge pull request #8957 from Fox-McCloud/fix-plastic
...
Fixes Plastic Recipe
2018-04-29 18:03:41 -07:00
Fox McCloud
c73a6b237d
logging
2018-04-29 21:03:31 -04:00
tigercat2000
49195e4f3e
Merge pull request #8941 from Anasari/kittyears
...
Add kitty ears to load out
2018-04-29 17:56:19 -07:00
tigercat2000
3271a6270c
Merge pull request #8956 from Fox-McCloud/oh-noooo
...
Does Surgery on Surgery to Fix Surgery
2018-04-29 17:55:47 -07:00
Fox McCloud
cd8c38bb40
Fixes Plastic Recipe
2018-04-29 20:54:18 -04:00
Fox McCloud
f7181df136
Does Surgery on Surgery to Fix Surgery
2018-04-29 20:41:37 -04:00
FalseIncarnate
94aa18ceda
E.L.O. Fluff Item
...
Adds E.L.O.'s fluff item: a personalized medical beret.
Ckey: `V-Force_Bomber`
Character Name: `E.L.O.`
2018-04-29 12:32:26 -04:00
Fox McCloud
278e6a7c25
the last of the TIMER_STOPPABLE
2018-04-29 01:12:57 -04:00
Fox McCloud
510c5b4268
fixes
2018-04-29 00:53:13 -04:00
Fox McCloud
cfe182a1f7
Ports over Timer Subsystem
2018-04-28 20:26:04 -04:00
Ansari
cf307b6217
Add kitty ears to load out
2018-04-28 12:07:35 +08:00
tigercat2000
dabdbd4426
Merge pull request #8929 from Aurorablade/MagicalPlasma
...
Tries to fix plasma wizards
2018-04-27 17:06:49 -07:00
Fox McCloud
8f5f57dd0b
adds clapping
2018-04-27 19:27:47 -04:00
Fox McCloud
b238dfc581
Ports Guillotine
2018-04-27 18:58:23 -04:00
Fox McCloud
3dd1a8861d
Ports TG's Blastcannon
2018-04-27 07:22:55 -04:00
Aurorablade
21aa88ca59
missing thing
2018-04-26 18:55:55 -04:00
Crazy Lemon
608a4531ff
Merge pull request #8924 from Fox-McCloud/ORM-refactor
...
ORM Refactor
2018-04-26 14:55:26 -07:00
Fox McCloud
402f9d4c6b
Merge pull request #8817 from uraniummeltdown/mob
...
[READY] Mob Proc Cleanup
2018-04-26 17:19:02 -04:00
uraniummeltdown
442f4f0b6a
tweak logging
2018-04-27 02:00:36 +05:00
Aurorablade
f2815bff7c
Fixed plasmamen wizard
2018-04-26 03:58:50 -04:00
Fox McCloud
e37b9064f7
Fixes Cryo Ghosting
2018-04-26 03:15:42 -04:00
Fox McCloud
9f04939385
comment
2018-04-25 23:24:27 -04:00
Fox McCloud
8c7b543415
The Great Conflictening 2.0: Removes /obj/item/device
2018-04-25 23:07:35 -04:00
tigercat2000
e086908c44
Merge pull request #8897 from Fox-McCloud/adds-frame
...
Adds F.R.A.M.E. Cartridge
2018-04-25 18:57:29 -07:00
tigercat2000
5fd9b42163
Revert all mob-code changes
2018-04-25 16:41:58 -07:00
tigercat2000
df26483e67
Fix runtime logs & Remove a bunch of painful admin notifications
2018-04-25 16:35:02 -07:00
Fox McCloud
fa683dd3c1
ORM Refactor
2018-04-25 14:26:51 -04:00
Tayyyyyyy
12aea54e84
Fix PM box revealing admin char, incorrect PM target for non-admins
2018-04-25 01:53:11 -05:00
tigercat2000
ad24d3a584
Merge pull request #8901 from Fox-McCloud/component-port
...
Ports TG Components and R&D Tweaks
2018-04-24 19:01:49 -07:00
Fox McCloud
abd8e3d1e2
Merge pull request #8908 from tigercat2000/aurora_caelus
...
Adds the Aurora Caelus event, the deep-space equivalent of the northern lights.
2018-04-24 21:18:17 -04:00
tigercat2000
fbfb48b2a8
Merge pull request #8911 from Tayyyyyyy/hide_pm_name
...
Hide PM mob name from non-admins
2018-04-24 18:11:00 -07:00
Fox McCloud
727c66368b
Merge pull request #8915 from Bram961/Cleanbot
...
Cleanbot oversight
2018-04-24 16:34:04 -04:00
Kluys
7160194295
Cleaning speed back to normal
...
This is better done in a general cleaning/blood and dirt reduction update.
2018-04-24 21:21:10 +02:00
Kluys
129930fb81
Cleanbot overslight/upgrade
...
with the increase in blood decals the station is almost always a giant mess.
🆑 Kluys
Tweak: Cleanbots clean a decal twice as fast (movement speed remains the same)
Fix: Cleanblots not cleaning /obj/effect/decal/cleanable/trail_holder (blood trails)
/🆑
2018-04-24 18:02:47 +02:00
Fox McCloud
d1750d15f2
derp
2018-04-24 02:28:02 -04:00
Fox McCloud
d216cf06b1
sprite revert
2018-04-24 02:14:58 -04:00
Fox McCloud
cadfeea3de
consistency
2018-04-23 22:50:11 -04:00
Fox McCloud
a58c2a8693
smelter to components
2018-04-23 19:56:27 -04:00
Tayyyyyyy
854422565c
Hide PM mob name from non-admins
2018-04-23 18:19:28 -05:00
Fox McCloud
a431b92c61
forgot this
2018-04-23 15:47:49 -04:00
Fox McCloud
7c8299d443
mint machine
2018-04-23 15:44:29 -04:00
Fox McCloud
eafd57487c
Merge remote-tracking branch 'upstream/master' into component-port
...
# Conflicts:
# paradise.dme
2018-04-23 13:54:50 -04:00
uraniummeltdown
0665c0ac27
new logging system
2018-04-23 21:43:58 +05:00
uraniummeltdown
f685a74733
removes unnecessary alien and brain rads code
...
fix the wryn harm intent special
only slimes that actually die produce death message
slime emotes now log, slimes can change their face/mood with new emotes
plasma and epinephrine can control slime mutation chances, docility potion makes slimes docile and non-hungry instead of creating a SA slime, added proc to add nutrition
slime attack surgery fixes, slimes steal nutrition from other slimes on attacking
obj/item/weapon -> obj/item
2018-04-23 21:25:20 +05:00
uraniummeltdown
d873cf93fa
do_cpr() proc for humans
2018-04-23 21:25:20 +05:00
uraniummeltdown
2067048921
changes human/attack_hand() to be species-based
...
splits attack_hand() intents into their own species procs
2018-04-23 21:22:00 +05:00
