Commit Graph

5052 Commits

Author SHA1 Message Date
unknown
4b396a52e7 Resolved conflicts 2016-06-19 15:07:36 -04:00
Cheridan
944b695ec3 Merge pull request #18660 from coiax/fix-17560
All living mobs can now attempt to pick up cards
2016-06-19 13:37:59 -05:00
Joan Lung
b941a47a60 Adds cogscarabs to clock cult (#18685)
* Adds cogscarabs to clock cult

* playstyle string

* info

* oh good going

* no static

* delay it eating all the metal

* scarab removal service

* cog

* ree

* error handling

* todo: languages = RATVAR

* isclockmob

* very large box

* faintly glowing eyes
2016-06-19 17:26:35 +02:00
WJohn
55428bb8ad Merge pull request #18593 from pudl/cool-carpet
Re-implements old carpet sprite
2016-06-19 08:20:02 -04:00
unknown
706988154b Resolved conflicts 2016-06-17 18:56:51 -04:00
Jack Edge
64d6cb636c All living mobs can now attempt to pick up cards
Fixes #17560.

Removes ishuman() check, replaces with effective isliving() check, a la
paper bins.
2016-06-17 09:48:20 +01:00
oranges
8c9308acca Merge pull request #18613 from Core0verload/runtime_down
Puts down two runtimes
2016-06-17 13:40:03 +12:00
KorPhaeron
5fe4f395e9 Fulton Revival (#18480)
Miners can now purchase fulton extraction packs.
Miners can now purchase fulton medivac packs.
Two new fulton related bundles are available for purchase with vouchers.
2016-06-17 13:35:47 +12:00
unknown
f33a7efbf7 Resolved conflicts. 2016-06-16 19:10:07 -04:00
oranges
d4769b4ee2 Safer input for the station charter (#18556)
Prevents html entities and sets a maximum length of 30
2016-06-16 23:51:10 +01:00
unknown
a0c866967f Splits languages into languages_spoken and languages_understood. 2016-06-16 18:50:32 -04:00
Cruix
ac0bad5d61 Added priority overlay system. (#18225)
Added priority overlays to atoms, which will not be removed when overlays are cut and will always remain on top when new overlays are added. This requires everyone to use add_overlay() and cut_overlays() instead of overlays += and overlays.Cut(). These procs are found in __HELPERS/icons.dm, and the priority overlay list is found in game/atoms.dm. Everything else is replacing deprecated overlay manipulation.
2016-06-17 10:11:53 +12:00
Core0verload
bb43219915 Rebalances radioactive microlaser (#18537)
This PR is aimed at making radioactive microlaser less useless.

Radioactive microlaser is now a subtype of health analyzer. Using it on someone would print out target's health status. Useful for stealth. You can disable this in microlaser's menu.

You can disable microlaser's irradiation in the same menu. Just in case you want to check your own health without carrying a real health analyzer.

Radioactive microlaser has it's max rad output increased 200%.

Radioactive microlaser cooldown is cut in two.
2016-06-17 09:11:52 +12:00
c0
458a38cf21 Puts down two runtimes 2016-06-16 06:46:26 +03:00
Joan Lung
2ae6b94ba9 Merge pull request #18581 from Cruix/tiny_carp_fix
Using a dehydrated carp no longer strips the neutral faction from the owner.
2016-06-15 22:01:03 -04:00
GunHog
f8eca8b465 Fixes my updates (#18578)
- Fixes ash plating upgrade item not deleting itself when used.
- Fixes research scanner icon being reverted
2016-06-16 13:53:29 +12:00
Cheridan
7c3b95e7a4 Merge pull request #18570 from phil235/FixBundlenumberIdontevenremember
Fix bundle stuff: damage overlay, robotic augmentation, etc
2016-06-15 15:33:22 -05:00
pudl
8c7640ebd3 cool stuff! 2016-06-15 11:15:50 -05:00
unknown
bb10f6afb5 Using a dehydrated carp no longer strips the neutral faction from the owner. 2016-06-14 22:01:00 -04:00
oranges
9c451faa2c Merge pull request #18534 from Core0verload/ash_fix
Fixes unkillable ash drake (+ more runtime fixes)
2016-06-15 10:44:20 +12:00
phil235
2ce15a66d6 Fixes robotic chest and head augmentation being invisible for species without sexual dimorphism.
Fixes failing to heal robotic bodypart with coil still using 1 coil.
Fixes not being able to eat with sechailer adjust down.
Fixes damage overlay being invisible.
Adds some game logs and warn admins when a player reset a RD console database.
2016-06-14 21:12:23 +02:00
lordpidey
f640d7ddb7 Devil fixes (#18520)
Numerous small fixes/changes/balances to devils.

Notable changes:
It now requires more souls to increase. It is now 3,7,12 souls, up from 3,6,9.
Devils now have extra rules, no coercing into signing contracts with violence, and no intentionally physically harming another devil.
Burial garment banishment now works on true devils. <--- Unreported issue, can I use that fix for the mergetoken?
Renamed all demon files to devil
Updated religious supplies to have burial garments.
Burial garments re-added to box/meta
Increased infernal fireball cooldown
Soulsellers can now use a pitchfork without being harmed.
Added new book crate, which includes a codex gigas to cargo.
2016-06-14 15:43:33 +12:00
oranges
0ec02030c8 Merge pull request #18515 from ChangelingRain/clockworkpower
Clockwork airlocks and windoors are always powered
2016-06-14 09:23:06 +12:00
Joan Lung
59b26e9715 properly 2016-06-13 09:43:01 -04:00
Joan Lung
63998cb55d Can't use door remotes on doors you can't use 2016-06-13 08:30:00 -04:00
c0
9fdbe269d6 More fixes 2016-06-13 12:43:25 +03:00
oranges
eb30d5c84e Merge pull request #18242 from LatD/machineprototype
Item to cargo for R&D engineering tech
2016-06-13 14:08:05 +12:00
oranges
b20a5642de Merge pull request #18473 from RemieRichards/setDir()
Set dir()
2016-06-13 00:03:44 +12:00
oranges
a37b08c53d Merge pull request #18449 from xxalpha/fucklizard
L A R G E Graffiti YIFF IN HELL AND OTHERS
2016-06-13 00:00:33 +12:00
oranges
e594dc34ff Merge pull request #18462 from Niknakflak/MUSIC_AND_GUITARS_AND_STUFF_SHREDDING_YEA_FUCKING_FIXES_YEA_SOUND_WOO
Add an electric guitar and removes duplicate guitar sound files
2016-06-12 23:58:10 +12:00
Jordie0608
0846d6f30d fixes fire logging bracket 2016-06-12 20:58:55 +10:00
Remie Richards
b3b60b187b Manual repair of some edge cases. 2016-06-11 23:11:54 +01:00
Remie Richards
fda2c699fc Automatic conversion via Regex 2016-06-11 18:37:48 +01:00
xxalpha
ffc5bb5402 Better looking sprites and bug fixfsjasf 2016-06-11 16:01:30 +01: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
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
NikNakFlak
5dd2785699 Add an electric guitar and removes duplicate guitar sound files 2016-06-10 20:07:47 -07:00
oranges
ab73b4569a Merge pull request #18413 from phil235/FixAssortment1
Fives Fixes
2016-06-11 10:05:35 +12:00
xxalpha
9898f948b7 LARGE GRAFFITI 2016-06-10 22:31:38 +01:00
LatD
82e100ba43 Fix origin tech 2016-06-10 23:05:05 +03:00
LatD
d95a6abd29 Correct icon state 2016-06-10 23:04:35 +03:00
LatD
fa22cf4449 Add icon state 2016-06-10 23:03:57 +03:00
LatD
40590d2b6a Add filepath 2016-06-10 22:44:02 +03: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
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
oranges
fc23d8464c Merge pull request #18386 from hornygranny/patch-8
fixes godhand not deleting on drop
2016-06-10 11:51:17 +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
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