Commit Graph

747 Commits

Author SHA1 Message Date
Cheridan
7ab8f8772f Merge pull request #18794 from KorPhaeron/durkel
Adds missing return to boss loot
2016-06-21 23:13:49 -05:00
oranges
3a7eab6e05 Merge pull request #18729 from coiax/remove-spawn-3
Remove spawn III
2016-06-21 20:11:08 +12:00
KorPhaeron
d35a31d4ac Blood Contract 2016-06-20 20:14:35 -05: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
Jack Edge
821b3bc1b3 More spawn removal 2016-06-19 01:50:58 +01:00
KorPhaeron
c082b7df5a Missing return added to fultons 2016-06-17 19:08:41 -05:00
Xhuis
df08005b60 Two fixes 2016-06-17 00:13:17 -04:00
Xhuis
75d9e4174f [s] Lavaland Patch (#18398)
* Commit squash before update to master

* Removed repathing and slot machine shenanigans

* Legion spawn changes

* Map edits, round II

* Some changes

* Removes map changes, hopefully

* Conflicts 1

* Updates the maps

* Conflicts 2

* How about now?

* Remaps the colossus arena

* Restores old colossus spawning
2016-06-16 22:00:09 -05: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
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
oranges
538a963a4e Merge pull request #18551 from KorPhaeron/necro
Necropolis floors and walls
2016-06-15 19:19:41 +12:00
oranges
829243360d Merge pull request #18489 from Core0verload/ce_jetpack
Brings back CE's hardsuit jetpack
2016-06-15 10:44:59 +12:00
KorPhaeron
7ce49f0c1e Less Eyes 2016-06-14 17:37:01 -05:00
KorPhaeron
959a11218d Necropolis Turfs 2016-06-13 19:02:29 -05:00
c0
b615fb504f Brings back CE's hardsuit jetpack 2016-06-12 09:18:39 +03:00
Remie Richards
fda2c699fc Automatic conversion via Regex 2016-06-11 18:37:48 +01:00
c0
1a6fa0031d Adds explorer gas mask for lavaland miners 2016-06-11 10:38:53 +03:00
oranges
ab73b4569a Merge pull request #18413 from phil235/FixAssortment1
Fives Fixes
2016-06-11 10:05:35 +12:00
AnturK
859082829b Merge pull request #18401 from optimumtact/skorvydorvy
Adds admin notice and game log entry to the grief (lava) staff
2016-06-10 15:44:10 +02:00
c0
692e40688f Splits equipment_locker.dm 2016-06-10 11:48:45 +03: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
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
oranges
c699bae573 Adds admin notice and game log entry to the grief (lava) staff 2016-06-09 06:22:25 +00:00
oranges
47cb6db5ae Merge pull request #18337 from KorPhaeron/bubblegum2
Bubblegum
2016-06-09 09:22:02 +12:00
KorPhaeron
54c6b0e564 Fix 2016-06-07 15:03:16 -05:00
KorPhaeron
135012b101 Fix error in spawning colossus 2016-06-07 14:57:02 -05:00
AnturK
19eb97ae18 Moves some list initializations to New
Fixes missing ..() calls in New()
2016-06-07 18:39:13 +02:00
KorPhaeron
39bdefd9e6 Bubblegum 2016-06-07 03:43:20 -05:00
LatD
25827d6ccb [Ready] Tweaks some R&D levels (#18246)
Removes tech levels from some traitor objectives. They had tech levels even before the remake but apparently now that the levels got raised that became a problem. Also some small tweaks to other items to make some early levels easier to get.
2016-06-07 20:18:19 +12:00
Jack Edge
8cbb10cab2 Moved dragon loot into necropolis_chests.dm
In addition:
- Added an admin notification when dragon blood causes the dragon
transformation.
- Fixes #18275, lava staff can no longer turn transit tiles to lava.
2016-06-07 02:57:12 +01:00
oranges
d360479227 Merge pull request #17934 from coiax/bluespace-shelter-templates
Bluespace shelters use map templates
2016-06-07 13:43:59 +12:00
oranges
ef53e135e0 Merge pull request #18266 from MMMiracles/minipickers
Adds compact pickaxes
2016-06-07 13:23:26 +12:00
Jack Edge
a9b43f06bf Bluespace shelters use templates
🆑 coiax
rscdel: Bluespace shelter capsules can no longer be used on shuttles.
rscadd: Bluespace shelters may have different capsules stored. View what
your capsule has inside by examining it.
/🆑
2016-06-07 02:11:35 +01:00
Cheridan
cad969ce7b Merge pull request #18257 from KorPhaeron/snow
redpills snow turfs
2016-06-06 00:40:40 -05:00
KorPhaeron
8f03e896bc Missing equal sounds 2016-06-05 16:50:50 -05:00
AnturK
cd67c17a80 Merge pull request #18175 from Iamgoofball/patch-57
fixes gibtonite runtime
2016-06-05 14:43:30 +02:00
MMMiracles
5833990acb whew 2016-06-04 23:16:02 -04:00
MMMiracles
f7dd4495dd adds compact pickaxes to make pickaxes less non-relevant for miners 2016-06-04 23:12:06 -04:00
KorPhaeron
84bda094ba Fixes snow 2016-06-04 17:23:49 -05:00
TechnoAlchemist
d75ded29fa Adds all-seeing-eye to necropolis chests. (#18160)
* Swaps xray syringe with new item.

* blankspace

* standards
2016-06-04 02:52:04 -05:00
Iamgoofball
a3c6571cfd Fixes #18167 (#18170) 2016-06-03 14:48:32 -05:00
Iamgoofball
e745f7e923 Update mine_turfs.dm 2016-06-02 08:51:15 -07:00
Iamgoofball
aa44396e2e Fixes #18000
Fixes #18000
2016-06-02 08:45:02 -07:00
Razharas
9fdae2fe4e Merge pull request #17576 from LatD/Research
[Ready for test/merge] R&D level remake
2016-06-02 18:41:43 +03:00
KorPhaeron
26cbf2e3bb You've been down too long in the midnight sea 2016-05-30 23:35:03 -05:00
MMMiracles
d585656950 Potion of Flight (#18019)
* i cant wait to get this to become my snowflake OC

* id

* i dones it
2016-05-30 20:58:34 -05:00
Kyle Spier-Swenson
e7e8710ced fixes gibtonite explosions (#18046)
fixes #17951
fixes #18044
2016-05-30 18:02:11 -05:00
LatD
d89eb178c6 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-30 18:33:55 +03:00
oranges
617cc56da4 Merge pull request #17838 from KorPhaeron/lavaland3
Fixes lavaland atmos
2016-05-30 17:29:30 +12:00
oranges
1ebc858091 Merge pull request #17962 from coiax/admin-logging
Adds admin logging to megafauna movement, shuttle loading
2016-05-30 11:00:14 +12:00