Commit Graph

8053 Commits

Author SHA1 Message Date
Fox McCloud
e4678d1a9f Merge pull request #8568 from MarcellusPye/SulphAcidNoMore
Lets grays drink sulphuric acid
2018-02-20 04:16:11 -05:00
MarcellusPye
a426b93a7a Maintainer corrected comments 2018-02-20 19:45:57 +13:00
MarcellusPye
8235d8ec89 Calls parent 2018-02-20 19:38:55 +13:00
tigercat2000
f73c3c01d8 Merge pull request #8418 from Fox-McCloud/disco-inferno
Adds Dance Machine
2018-02-19 22:04:01 -08:00
Fox McCloud
0f0f7e13c6 Merge pull request #8444 from HugoLuman/whalecough
Adds coughing and sneezing sounds for Drask
2018-02-20 00:48:09 -05:00
Crazy Lemon
8979e2428d Merge pull request #8410 from tigercat2000/client_dir
Client dir compatibility, part 1
2018-02-11 16:40:44 -08:00
Aurorablade
20ddaccb9b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DisMemberments 2018-02-08 02:31:44 -05:00
Aurorablade
1f59e61bc9 I got to test this in a sec... 2018-02-08 02:31:30 -05:00
Aurorablade
2921d35037 fixed it. 2018-02-04 21:19:22 -05:00
Aurorablade
ddfde7c6fd urgh still not working 2018-02-04 21:01:21 -05:00
Aurorablade
235deac64a medhud fixes 2018-02-04 20:17:09 -05:00
Aurorablade
2980b37eba removes debug line 2018-02-02 01:48:51 -05:00
Aurorablade
061cbcfaf2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into MOREDOTS 2018-02-02 01:26:12 -05:00
Aurorablade
cbc446a479 it works tiger pants 2018-02-02 00:31:19 -05:00
tigercat2000
ebe366fd67 Merge pull request #8403 from Aurorablade/FollowThePath
Ports some hud updates from TG
2018-02-01 19:56:51 -08:00
Aurorablade
8e3b031e79 tigers suggestion 2018-02-01 18:23:11 -05:00
tigercat2000
0da85e6bb3 Merge pull request #8433 from Tayyyyyyy/maint_drones
Players job banned from syndicate can no longer play emagged drones
2018-02-01 08:19:50 -08:00
tigercat2000
d8a00048bd Merge pull request #8424 from uraniummeltdown/airlockoverlay
Airlock Overlays + Tweaks
2018-02-01 08:19:24 -08:00
Fox McCloud
5c24e7720d Merge remote-tracking branch 'upstream/master' into disco-inferno
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
2018-01-29 20:56:44 -05:00
tigercat2000
085c6b7961 Merge remote-tracking branch 'upstream/master' into client_dir
# Conflicts:
#	icons/turf/walls/rusty_reinforced_wall.dmi
2018-01-27 09:10:39 -08:00
tigercat2000
65130b3fc0 Movement delay is no longer rounded to the tick 2018-01-26 12:58:47 -08:00
MarcellusPye
4a963b796d Kills spaces dead 2018-01-25 18:42:56 +13:00
Tayyyyyyy
a5f5b3d47e Antag ban only antag banned players from drones 2018-01-24 14:09:54 -06:00
uraniummeltdown
134ad47f80 p_open -> panel_open 2018-01-23 18:10:57 +05:00
tigercat2000
7f512b9473 Merge pull request #8499 from Tayyyyyyy/drone_nerf
A menu of emagged drones nerfs and buffs
2018-01-21 13:13:06 -08:00
Tayyyyyyy
973940aad7 Serve dumbdumn a delicious dish of emagged drone nerfs
- Emagged drones are automatically destroyed after 5 minutes
- Emagged drones no longer get their diamond drill
- Emagged drones can't hide under tables
- Emagged drones lose density
2018-01-20 18:03:03 -06:00
tigercat2000
696136b579 Merge pull request #8565 from uraniummeltdown/repathvisual
effect/temp_visual update
2018-01-20 11:25:08 -08:00
MarcellusPye
ae1f4afe16 Hurray for proper form 2018-01-20 14:03:46 +13:00
tigercat2000
4830015bc4 Merge pull request #8550 from uraniummeltdown/tables
Table Construction Overhaul
2018-01-18 22:12:57 -08:00
uraniummeltdown
c89b1e8463 repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2018-01-18 13:03:49 +05:00
uraniummeltdown
9c90c817b6 adds missing lavastaff and guardian phase effect icons
kills off anim() proc, removes ninja rigsuit electricity effect
gets rid of the flick() in temporary_visual.dm because pooling is dead
updates ethereal_jaunt.dm and makes it OOP, wraiths no longer show the wizard animation, jaunters cannot move after duration is over, fixes directions errors
turns many anim() into obj/effect/overlay/temp
smoother pet heart animation
2018-01-18 12:56:18 +05:00
uraniummeltdown
8fd3a5e890 move cult effects to their own file
move cult beams to beam.dmi
2018-01-16 23:38:36 +05:00
tigercat2000
3570eb9532 Merge pull request #8524 from Kyep/ert_tweak_2018
Small ERT Spawn/Dress Refactor + Unspawned ERT notice
2018-01-13 09:50:21 -08:00
tigercat2000
a3664cb2e3 Merge pull request #8548 from Citinited/pools-closed
Fixes the freezing ocean and pool, and tweaks how mobs are heated / cooled by water
2018-01-13 09:30:56 -08:00
uraniummeltdown
7f4c9263ce removes table parts, adds table frames
table/woodentable -> table/wood
tables are built by applying stacks to table frames
altered table construction
cleaned the code and increased obj_integrity of some tables and racks
lowercased 'carpet'
2018-01-12 23:22:55 +05:00
Citinited
494dff37e9 water_act now gradually heats and cools mobs 2018-01-12 01:44:31 +00:00
tigercat2000
56287d7b2f Merge pull request #8491 from Tayyyyyyy/dark_view
Dark view increases flash damage to eyes
2018-01-11 12:36:11 -08:00
Aurorablade
44a8defdb5 try this 2018-01-10 00:41:44 -05:00
Aurorablade
a2601c0142 heh 2018-01-10 00:34:50 -05:00
Kyep
a5a3a14522 GCS 2018-01-08 23:03:55 -08:00
Kyep
ac0894b257 DeathSquid 2018-01-08 22:59:04 -08:00
Kyep
f13b15806a Refactor
- Deletes Paranormal & Janitor ERT outfits from /datum/outfit/admin (so
they won't show up in the main special outfit list as *static* outfits)
- Adds Paranormal & Janitor ERT outfits to 'emergency response team
member' sub-section of admin dress command, which means they're still
available, but now you can choose the level of them to equip to someone
(amber/red/gamma), instead of them always being the old static outfit
which doesn't match what real ERT actually use anymore.
- Refactors the way that spawning ERT cyborgs works, so that most of
their special stuff is done in New() instead of in response_team.dm.
This means that manually spawning an ERT cyborg will actually work,
rather than generating a half-ert cyborg with much of its special stuff
missing.
- Adds a new subtype of ERT cyborg, /mob/living/silicon/robot/ert/gamma,
which is absolutely identical to the normal ert borg, except that it
always has gamma module unlocked.  This enables admins to manually spawn
ERT gamma borgs, instead of all ERT borgs spawned always being non-gamma
ERT borgs.
2018-01-07 19:14:24 -08:00
Crazy Lemon
6d7f84d92c Merge pull request #8425 from Terilia/RobotFont
AI & Cyborg - Changing the font in the binary channel to something more robotic
2018-01-04 15:53:12 -08:00
Fox McCloud
2564530d73 Merge remote-tracking branch 'upstream/master' into disco-inferno 2018-01-04 18:51:17 -05:00
Tayyyyyyy
301fc69fca Self destruct emagged drone after 5 minutes 2018-01-02 17:18:01 -07:00
Tayyyyyyy
a27bc14e59 Give emagged drones galactic common 2018-01-02 16:08:00 -07:00
Tayyyyyyy
ed70020015 Eyes are more sensitive to damage in the dark 2018-01-02 15:04:04 -07:00
Tayyyyyyy
d4e31851f0 Dark view increases flash damage to eyes 2018-01-02 15:01:31 -07:00
tigercat2000
c1c4b08807 Merge pull request #8476 from uraniummeltdown/decon
deconstruct() at obj level + other changes
2018-01-02 10:28:17 -08:00
Tayyyyyyy
c8a0dfa3f3 Fix drone emagger's pronouns 2017-12-31 14:36:17 -07:00