Commit Graph

5074 Commits

Author SHA1 Message Date
Joan Lung
e6efbdf88f Cogscarab storage is no longer painted cardboard (#18821) 2016-06-22 18:48:36 -05:00
Joan Lung
8c8c69c8ac Merge pull request #18714 from coiax/fridge-magnet
Station rename logging, admin reject button
2016-06-21 08:46:17 -04:00
Jack Edge
3e30473365 Applied MSO's proposed changes 2016-06-21 13:34:36 +01:00
oranges
3a7eab6e05 Merge pull request #18729 from coiax/remove-spawn-3
Remove spawn III
2016-06-21 20:11:08 +12:00
PKPenguin321
01d4d02b70 conflicts + undo loc changes
attackself/dragging the board now deletes it and spawns a new board of the proper type again instead of setting locs
2016-06-20 22:22:50 -07:00
Kyle Spier-Swenson
0d6bbbb412 stop the pills (#18703)
* RedPills Processing

Now you have to use START_PROCESSING(SSname, thing) (and STOP_PROCESSING)

* Fixes a minor bug.
2016-06-20 12:07:44 +02:00
oranges
bce99c4f58 Merge pull request #18668 from coiax/dropdel
Adds DROPDEL flag; items will qdel() on dropped()
2016-06-20 11:08:31 +12:00
oranges
448e386ac4 Merge pull request #18649 from Xhuis/my_eyes_have_seen_that_which_cannot_be_comprehended
Reagent tank optimization
2016-06-20 08:18:33 +12:00
oranges
7dc92e3f98 Merge pull request #18647 from TechnoAlchemisto/I_was_lucky_if_papa_went_for_me_first_because_then_at_least_I_would_be_too_disoriented_to_realize_what_he_was_doing_to_sis
Adds hard cider to the bar.
2016-06-20 08:18:05 +12:00
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
Jack Edge
9185f06d31 Removes spawn from things 2016-06-19 01:25:29 +01:00
Jack Edge
4b70b35c3e Back by popular demand, custom naming 2016-06-18 17:36:03 +01:00
Jack Edge
55c56a9f29 Modifies station charter to use piecemeal naming 2016-06-18 16:19:42 +01:00
unknown
706988154b Resolved conflicts 2016-06-17 18:56:51 -04:00
TechnoAlchemist
ecf0acd3bf Thanks Phil! 2016-06-17 13:34:41 -07:00
Jack Edge
a13719c17a Code review 2016-06-17 17:16:40 +01:00
Jack Edge
8ca69eabbb Adds DROPDEL flag; items will qdel() on dropped()
Pretty self explanatory, replaces writing a dropped() proc that just
calls qdel() with a flag that does it for you.
2016-06-17 12:14:28 +01: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
PKPenguin321
3254e28a89 tweaks 2016-06-16 19:44:34 -07:00
PKPenguin321
c12f351e30 makes them go inside each other
;)
2016-06-16 18:59:12 -07:00
Xhuis
41935f8628 Reagent dispenser optimization and tweaks 2016-06-16 21:56:14 -04: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
PKPenguin321
90678607d4 Merge branch 'master' of https://github.com/tgstation/-tg-station into boardsmacked
# Conflicts:
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
2016-06-14 17:01:23 -07:00
PKPenguin321
ee2a964c07 new skateboard sprites 2016-06-14 16:52:24 -07: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
PKPenguin321
a6655db4fa Merge branch 'master' of https://github.com/tgstation/-tg-station into boardsmacked
# Conflicts:
#	icons/obj/weapons.dmi
2016-06-14 14:28:03 -07: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