224b18af1c
Merge remote-tracking branch 'upstream/master' into attack-animation-improvements
2018-05-17 23:34:01 -04:00
7aa9731e52
Merge pull request #8898 from tigercat2000/face_lock
...
Directional Locking
2018-05-17 20:28:03 -07:00
85a19c9935
Merge remote-tracking branch 'upstream/master' into face_lock
...
# Conflicts:
# code/modules/mob/mob.dm
2018-05-17 20:21:39 -07:00
1cfc3f27c8
Merge pull request #8974 from Fox-McCloud/holo-projector
...
Ports Holoprojectors
2018-05-17 20:19:13 -07:00
c0d5655f4d
Further Improves Attack Animations
2018-05-17 19:48:03 -04:00
709f2b5ff6
Merge pull request #9004 from Anasari/BotLogging
...
Naming bots is now logged
2018-05-15 22:06:46 -04:00
4c1dc7dea7
Merge pull request #9017 from Tayyyyyyy/punpun
...
Restore Pun Pun
2018-05-15 17:59:57 -04:00
8a8f244d3f
Remove unneeded args
2018-05-15 01:15:27 -07:00
fea1dada3a
Restore Pun Pun
2018-05-14 22:31:05 -07:00
63ec546a0a
Merge pull request #9008 from Fox-McCloud/remove-mode
...
Removes All Modes
2018-05-14 17:49:58 -07:00
b3524505b5
tweak
2018-05-14 17:51:13 -04:00
69cefb7f3c
Actually fix usr to user and compile
2018-05-12 10:28:26 +08:00
de818d92ab
user instead of usr
2018-05-12 10:14:14 +08:00
f521f2765c
Removes All Modes
2018-05-11 17:55:45 -04:00
6084f5cfef
Log bot
2018-05-10 16:32:34 +08:00
254cdd6055
Merge pull request #8972 from Fox-McCloud/power-cell
...
Power Cell Code Cleanup
2018-05-09 11:26:03 -07:00
aedece7207
Merge pull request #8989 from Kyep/nations_etc_borg_runtime
...
Fixes #8271 - rare borg runtimes
2018-05-09 11:22:04 -07:00
7d4fb45509
Merge pull request #8947 from tigercat2000/more_ss_ports
...
SS Conversion: Atoms, Machines, n' Mobs
2018-05-07 17:54:49 -04:00
a6d06ea397
Fixes #8271 - rare borg runtimes
2018-05-06 22:21:35 -07:00
c78075414c
Merge pull request #8488 from Kyep/ds_tweaks
...
Tweaks Deathsquad
2018-05-04 19:03:54 -07:00
8845262d65
Merge remote-tracking branch 'upstream/master' into holo-projector
...
# Conflicts:
# _maps/map_files/cyberiad/cyberiad.dmm
# paradise.dme
2018-05-04 16:37:24 -04:00
8bd042240f
Power Cell Code Cleanup
2018-05-02 19:35:18 -04:00
cacde22a27
Readd human/New warning about excessive arguments
2018-04-30 09:36:22 -07:00
7fb8f8d76c
Merge remote-tracking branch 'upstream/master' into more_ss_ports
...
# Conflicts:
# paradise.dme
2018-04-30 09:27:11 -07:00
b394cf3624
Ports Holoprojectors
2018-04-30 00:24:46 -04:00
3c1fbf9cc5
Merge pull request #8938 from Fox-McCloud/guillotine
...
Ports Guillotine
2018-04-29 20:28:50 -07:00
63e2a175fd
Merge remote-tracking branch 'upstream/master' into timer-subsystem
2018-04-29 21:14:11 -04:00
f7181df136
Does Surgery on Surgery to Fix Surgery
2018-04-29 20:41:37 -04:00
278e6a7c25
the last of the TIMER_STOPPABLE
2018-04-29 01:12:57 -04:00
510c5b4268
fixes
2018-04-29 00:53:13 -04:00
7d8c9a731a
SS Conversion: Atoms, Machines, n' Mobs
...
This converts the machine and mob processes to the SMC. Additionally, it
adds the Atom subsystem, which handles all Initialize() calls in place
of the old gameticker. Due to incompatibility with our atmospherics
(FUCK OUR ATMOSPHERICS FOR FUCKING EVER JESUS CHRIST WHO THE FUCK MADE
THIS PIECE OF GODDAMN SHIT) atmospherics machines do not use
Initialize() as they should, instead opting for a custom atmos_init
proc that the air controller handles.
2018-04-28 17:55:15 -07:00
cfe182a1f7
Ports over Timer Subsystem
2018-04-28 20:26:04 -04:00
dabdbd4426
Merge pull request #8929 from Aurorablade/MagicalPlasma
...
Tries to fix plasma wizards
2018-04-27 17:06:49 -07:00
8f5f57dd0b
adds clapping
2018-04-27 19:27:47 -04:00
3d55fb6a83
Leaving viewers() will now break a lock
2018-04-27 13:48:56 -07:00
21aa88ca59
missing thing
2018-04-26 18:55:55 -04:00
402f9d4c6b
Merge pull request #8817 from uraniummeltdown/mob
...
[READY] Mob Proc Cleanup
2018-04-26 17:19:02 -04:00
442f4f0b6a
tweak logging
2018-04-27 02:00:36 +05:00
f2815bff7c
Fixed plasmamen wizard
2018-04-26 03:58:50 -04:00
e37b9064f7
Fixes Cryo Ghosting
2018-04-26 03:15:42 -04:00
682b9aaaf3
fixes merge conflict
2018-04-25 23:36:39 -07:00
8c7b543415
The Great Conflictening 2.0: Removes /obj/item/device
2018-04-25 23:07:35 -04:00
5fd9b42163
Revert all mob-code changes
2018-04-25 16:41:58 -07:00
df26483e67
Fix runtime logs & Remove a bunch of painful admin notifications
2018-04-25 16:35:02 -07:00
727c66368b
Merge pull request #8915 from Bram961/Cleanbot
...
Cleanbot oversight
2018-04-24 16:34:04 -04:00
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
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
0665c0ac27
new logging system
2018-04-23 21:43:58 +05:00
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
d873cf93fa
do_cpr() proc for humans
2018-04-23 21:25:20 +05:00
Fox McCloud