Commit Graph

15458 Commits

Author SHA1 Message Date
c0
4d01e17ba0 Refactors mech directional armor 2016-06-13 17:07:21 +03:00
c0
9fdbe269d6 More fixes 2016-06-13 12:43:25 +03:00
Xhuis
50fd38c4ac Bandaid fix for plasmaman wizards (#18446) 2016-06-11 16:04:20 -05:00
Cheridan
d933226d16 Merge pull request #18435 from KorPhaeron/pope
Fixes pope spam
2016-06-11 14:04:15 -05:00
Cheridan
d9e96281de Merge pull request #18438 from ChangelingRain/componentscarcity
Makes clockwork component generation slightly less crazy
2016-06-11 13:16:39 -05:00
Joan Lung
88c96aa5e8 brief delay 2016-06-11 10:25:36 -04:00
Jordie
0777916328 Merge pull request #18402 from optimumtact/flamingfunremoval
Better logging and notification of setting on fire
2016-06-11 23:53:34 +10:00
oranges
d97d8e6d6e Merge pull request #18432 from Core0verload/newmask
Adds explorer gas mask for lavaland miners
2016-06-12 01:14:48 +12:00
Joan Lung
3018b4bec1 restore 2016-06-11 09:13:31 -04:00
oranges
f2a19e08c5 Merge pull request #18434 from bgobandit/cameraicons
Camera icons now properly update upon EMP and deactivation.
2016-06-12 01:13:07 +12:00
oranges
bf9643563d Ensure we only log and notify admins when person is set on fire
This takes advantage of the now refactored IgniteMob returning true when
it successfully ignites the mob
2016-06-11 13:08:05 +00:00
Joan Lung
35e6f676c8 Merge branch 'master' of https://github.com/tgstation/tgstation into componentscarcity
Conflicts:
	code/game/gamemodes/clock_cult/clock_structures.dm
	code/game/turfs/simulated/walls_misc.dm
2016-06-11 09:06:06 -04:00
Joan Lung
e49849048e faster floors 2016-06-11 08:50:26 -04:00
oranges
d286cf4dd6 Merge pull request #18428 from Core0verload/clocker_fix
Fixes tinker's cache exploit
2016-06-12 00:50:14 +12:00
oranges
39612b3ba2 Merge pull request #18430 from coiax/fix-18258
Countdowns follow bomb; fixes syndibomb countdown
2016-06-12 00:41:18 +12:00
oranges
611151d25f Merge pull request #18278 from coiax/somebody-at-the-door
Ghosts are notified when someone joins
2016-06-12 00:40:57 +12:00
Joan Lung
616dc140b4 Clockwork Proselytizer now uses a proc instead of a huge else if (#18419)
Instead of a huge else if chain, it's a proc that returns either an associated list with the values the proselytizer will use for it or FALSE, if it can't be proselytized.

This makes it easier to mess with and also saves like 5 lines!
Bonus; harm intent no longer disables proselytizing because wow that's a pain in the butt, holy crap.
2016-06-12 00:40:14 +12:00
c0
1a6fa0031d Adds explorer gas mask for lavaland miners 2016-06-11 10:38:53 +03:00
Joan Lung
ff6b5028f9 Anima Fragments get a number after their name (#18463) 2016-06-10 22:42:37 -05:00
oranges
ab73b4569a Merge pull request #18413 from phil235/FixAssortment1
Fives Fixes
2016-06-11 10:05:35 +12:00
Jack Edge
beeced08be Ghosts are notified when someone joins
🆑 coiax
rscadd: Ghosts are notified when someone arrives on the Arrivals
Shuttle. This is independent of the announcement system, and the (F)
link will follow the arrived person.
/🆑

Also I got rid of a trailing return.
2016-06-10 17:17:26 +01:00
Joan Lung
077745a6a6 description 2016-06-10 12:15:38 -04:00
Joan Lung
82e5b7fb99 failed scripture refunds components 2016-06-10 12:11:11 -04:00
coiax
fd20fa8b10 Observers can see clockcult description on sigils (#18411)
No longer be confused by the difference between a dull sigil, an ominous
sigil or a sulking sigil.
2016-06-10 11:02:12 -05:00
Joan Lung
eaf0e464a3 use the right proc 2016-06-10 10:49:17 -04:00
Joan Lung
f73ae66659 testing 2016-06-10 10:37:09 -04:00
Joan Lung
4faa1124b6 Makes clockwork component generation slightly less crazy 2016-06-10 10:30:03 -04:00
KorPhaeron
bc37db117a Fixes pope spam 2016-06-10 08:52:45 -05:00
Joan Lung
352e6831f9 Clockwork structures are now slightly more resistant to lava (#18410)
* Clockwork structures are now slightly more resistant to lava.

* flying mobs that are immune to lava what a shocker

* sanity

* ,
2016-06-11 01:37:28 +12:00
bgobandit
1c7ef8267c Camera icons now properly update upon EMP and deactivation. 2016-06-10 09:35:48 -04:00
Jack Edge
2cf94f2e75 Countdowns follow bomb; fixes syndibomb countdown
Fixes #18258. Partially at least. Countdowns now follow their attached
atom, syndicate bombs now start their attached countdown.
2016-06-10 12:24:00 +01:00
c0
ea5162cdd1 Fixes tinker's cache exploit 2016-06-10 11:40:50 +03:00
oranges
a726c30a7f Merge pull request #18397 from coiax/fix-18352
Refactors slime names; altered slime, xeno names kept when evolving
2016-06-10 20:03:43 +12:00
oranges
db05d6939e Merge pull request #18399 from bgobandit/stopfuckingbumpingmeyoufuckshit
Interrupted drawings will not affect the text buffer.
2016-06-10 15:58:53 +12:00
oranges
d937e0679f Merge pull request #18418 from ChangelingRain/reallygayte
Fixes the infinite shuttle when a clockwork gateway is Destroy()ed
2016-06-10 14:49:00 +12:00
Joan Lung
831983e9ee Fixes the infinite shuttle when a clockwork gateway is Destroy()ed 2016-06-09 22:37:44 -04:00
Joan Lung
4b9c4c7adb Merge pull request #18394 from lzimann/stools2
Bar stool no longer becomes a normal stool and are now constructables
2016-06-09 22:01:19 -04:00
Joan Lung
60e639ca73 Fixes a summon cultist runtime (#18390)
Fixes a summon cultist runtime
2016-06-10 13:16:16 +12:00
Core0verload
77d70b9955 Finishes boards refactor (#18392)
This PR finishes work started in #17300 by making all the machines use apply_default_parts(src) for components initialization.

It also adds two new board sprites, one for Abductor boards and one for Ravtar boards:
board board_a board_r

There are no deconstructable Ravtar machines yet, sprites are added for future use. Abductor sprite is used only by Seed Vault's plant DNA modifier. It wasn't made by actual abductors, but it was surely made by aliens.

Boards now have a new var: def_components. It is a list containing replacement paths for default parts. For example, list(/obj/item/weapon/stock_parts/matter_bin = /obj/item/weapon/stock_parts/matter_bin/super) would make machine spawn with super matter bins instead of basic ones by default.

Console screens that were used in machines instead of glass sheets are replaced with actual glass sheets. Support for sheets as machine components was added in a previous PR
2016-06-10 13:13:33 +12:00
Remie Richards
a13c0bdd77 Fixes lings not getting notes from husking (#18405) 2016-06-09 18:52:09 -05:00
oranges
fc23d8464c Merge pull request #18386 from hornygranny/patch-8
fixes godhand not deleting on drop
2016-06-10 11:51:17 +12:00
oranges
148af6e80d Merge pull request #18383 from pudl/cargo-fix
fixes cell doors/timers
2016-06-10 10:21:58 +12:00
oranges
38baee52b5 Merge pull request #18379 from ChangelingRain/stationisagoodfriendtoconvert
You can't summon the Ark of the Clockwork Justicar on a shuttle
2016-06-10 09:51:37 +12:00
Razharas
4b7d83be77 Merge pull request #18375 from ChangelingRain/gearhud
Makes cyborg ratvar conversion work properly
2016-06-09 22:43:54 +03:00
phil235
219639e00b Using a multitool on telepad with open panel to save data no longer hits the machine.
Packagewrapping a pulled item now properly stops the pulling.
Using put_in_hands() procs now properly checks if the mob has a hand.
bodyparts icon_state is now "" like it should be.
You can no longer build a firelock on top of another firelock.
You can reinforce a firelock assembly to build a heavy firlock.
Human species who breath something other than oxygen now get the proper alert when in crit, and I fixed the alert not being removed when healed.
2016-06-09 20:46:00 +02:00
Jack Edge
4f8981c6a5 Refactors slime names; altered slime, xeno names kept when evolving
Also fixes #18352.

Slime colour and adulthood are specified in New(), which is a lot better
than having an ugly spawn(0) in the middle of a New(). Slimes also only
update their names when growing or shrinking when it matches their
existing name format.

So if you happen to be a slime called Carl Lagerfield, it won't change
your name if you grow up to adulthood.

In addition non-standard xeno names are preserved while evolving.
And it also applies your old dir to the new xeno, because that looks
slightly better.
2016-06-09 15:57:24 +01:00
Joan Lung
790351b4a7 Revert "Theme"
This reverts commit a6ffdeb223.
2016-06-09 09:39:01 -04:00
Joan Lung
a6ffdeb223 Theme 2016-06-09 09:30:43 -04:00
Joan Lung
8d2da45e8c duh 2016-06-09 08:39:16 -04:00
Joan Lung
c5ee14a0e3 gotta emag the borg 2016-06-09 08:21:24 -04:00