Commit Graph

876 Commits

Author SHA1 Message Date
Joan Lung
ea99851a07 Clockcult stuff has colored lighting (#24678)
* Clockcult stuff has colored lighting

* fixsigils
2017-03-08 12:03:12 -06:00
coiax
f88184937a Glowsticks (#24761)
* Ports glowsticks from Bay

* Adds glowstick sprites

* Glowsticks in party crates, maint and emergency toolboxes
2017-03-08 02:38:15 -06:00
Cheridan
deb4c2cde3 Merge pull request #24743 from ChangelingRain/glowshrooms
Glowshrooms now have colored light, tweaks glowshroom/glowberry lighting range
2017-03-08 02:30:46 -06:00
coiax
2d288690e1 New Librarian traitor item: Haunted Magic Eightball (#24607)
* New Chaplain traitor item: Haunted Magic Eightball

🆑 coiax
add: Toy magic eightballs can now be found around the station in
maintenance and arcade machines. Ask your question aloud, and then
shake for guidance.
add: Adds new Chaplain traitor item, the Haunted Magic Eightball.
Although identical in appearence to the harmless toys, this occult
device reaches into the spirit world to find its answers. Be warned,
that spirits are often capricious or just little assholes.
/🆑

* Compiles, fixes the bugs

* Adds toy eightballs to loot, toys; adds haunted to uplink

* Every 3 minutes

* Noiseless, random haunt, limited stock

* Added sprites for eightball

* Removed notice to replace sprites

* Librarian only
2017-03-08 12:14:44 +13:00
Joan Lung
a73cb2cfce Not Bioluminescence 2017-03-06 20:41:36 -05:00
Joan Lung
08cc485e98 glowy shit 2017-03-06 20:35:57 -05:00
Joan Lung
10100f1d9f Glowshrooms now have colored light 2017-03-06 13:19:40 -05:00
PJB3005
a63608d023 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-03-03 16:31:00 +01:00
coiax
b3a52289ef Posters refactor (#24548)
* Posters refactor

- Posters now use a simple type-per-poster definition, rather than some
large global lists requiring sprite numbers to be the same as entries in
a list.
- Putting a specific poster on a map now simply means putting the
specific type that you want, rather than var editing (often
unsuccessfully).
- There are random all-posters, random contraband posters, and random
official posters for mappers too.
- Ripped posters are now their own type.
- The potential to make additional classes of posters has been left
open, I'd like to move a bunch of the advertisement posters to their own
catagory, and clean up the "official" category to be more obviously
on-brand.

* Updates DeltaStation

* Changed the maps of Metastation

* OmegaStation posters updated

* Updated Pubby posters

* Map merged?

* Updated away mission and ruin posters

* Removes vars from garbage
2017-03-03 11:16:19 +13:00
Cyberboss
0a7b9320af Fixes mine effect being activated when picked up 2017-02-27 12:38:51 -05:00
WJohn
a13a52a98f Merge pull request #24348 from dannno/vendy
Sodie pops
2017-02-23 07:55:34 -05:00
Dannno
b3463d20ce weeeeooooweeoowowowowow i deed it yah wah one up!!! 2017-02-21 20:59:29 -05:00
coiax
de0b29dea6 Partially grown clones are horribly disfigured + cardiac arrest refactor (#24106)
add: Refactors heart attack code, a cardiac arrest will knock someone unconscious and kill them very quickly.
add: Adds corazone, an anti-heart attack drug, made by mixing 2 parts Phenol, 1 part Lithium. A person with corazone in their system will not suffer any negative effects from missing a heart. Use it during surgery.
add: Abductor glands are now hearts, the abductor operation table now automatically injects corazone to prevent deaths during surgery. The gland will restart if it stops beating.
fix: Cloning pods always know the name of the person they are cloning.
add: You can swipe a medical ID card to eject someone from the cloning pod early. The cloning pod will announce this over the radio.
del: Fresh clones have no organs or limbs, they gain them during the cloning process. Ejecting a clone too early is not recommended. Power loss will also eject a clone as before.
del: An ejected clone will take damage from being at critical health very quickly upon ejection, rather than before, where a clone could be stable in critical for up to two minutes.
add: Occupants of cloning pods do not interact with the air outside the pod.


After @Cyberboss 's multi-pod cloning got merged, I scrapped the multi-pod stuff from my own work, and brought back the maiming.

Early ejected clones being partially disfigured is a cool feature.

This penalises (but does not completely remove) speed cloning, as there is a window where the clone can be ejected without missing any limbs or organs. Otherwise the clones will probably die due to lack of lungs or heart.

Heart attacks are more lethal, there's an easy medicine for treating them, if chemistry have it on hand.

Clones not reacting to the air around them is a buff to plasmamen (although they'll still burn to death once they're ejected in an oxygen atmosphere).
2017-02-21 11:13:54 +13:00
Pieter-Jan Briers
b5b93e51f7 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-18 16:52:07 +01:00
TrustyGun
38419057b7 Advanced Mimery Kit (#23978)
d

🆑
add: Traitor mimes can now learn two new spells for 15 tc.
add: The first, Invisible Blockade, creates a 3x1 invisible wall.
add: The second, Finger Guns, allows them to shoot bullets out of their fingers.
/🆑

Traitor mimes can buy the Guide to Advanced Mimery for 15 tc. Invisible Blockade creates a 3x3 invisible wall around the mime, and Finger Guns allows Mimes to shoot bullets out of their fingers.

Invisible Blockade is 3x1 now to avoid this problem and still make Mimes be blocked by their own walls.
2017-02-19 00:49:40 +13:00
Cyberboss
ee257e1c91 Fixes massive throwing runtimes 2017-02-13 12:15:49 -05:00
PJB3005
f11c558c99 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-12 16:35:57 +01:00
Pyko1
a3a8503ddf Poster fix (#23901)
🆑 Pyko
fix: Fixed legit posters and map editing official/serial number for poster decals.
/🆑
Fixes: #23900
2017-02-12 09:34:13 +13:00
PJB3005
3c8b98a3aa 9/11 2017-02-08 15:07:58 +01:00
PJB3005
8ce6ae2b87 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-08 14:30:23 +01:00
Xhuis
21996756be Adds the artistic toolbox and His Grace (#23699)
* Adds His Grace

* Resets victims and warnings on sleep

* Now with compiling!

* Adds the artistic toolbox and maintenance loot
2017-02-08 18:22:00 +13:00
Cyberboss
b86e224571 Makes qdeleted and qdestroying macros (#23666)
* Makes qdeleted and qdestroying macros

* Makes QDELETED and QDESTROYING uppercase

* Swap qdel checks istype's for != null's

* Fix it

* How was this missed?
2017-02-06 00:59:27 +13:00
Joan Lung
9c579f61b3 Tweaks brass window icons (#23670)
* Tweaks brass window icons

* one tweak
2017-02-04 11:35:30 -06:00
Joan Lung
9fe0b2f2e9 Merge pull request #23502 from Cyberboss/patch-13
Prevents effects from feeding the singulo
2017-02-03 22:45:06 -05:00
Cyberboss
ecc3b29500 Fixes /obj/effect/landmark/start failing to GC (#23551) 2017-02-02 11:31:41 +01:00
Leo
dae4a9dce3 Changes the laser projectile icon. Adds a new one when it hits a wall. (#23524)
* Changes the laser projectile icon. Adds a new one when it hits a wall.

* Changes the duration to 10
2017-02-01 15:46:43 +01:00
Cyberboss
9e522fafe0 Prevents effects from feeding the singulo 2017-01-31 10:21:23 -05:00
Joan Lung
dede4a897d Nerfs Volt Void (#23444)
* Nerfs Volt Void

* 4

* Cyborgs no are no longer immune
2017-01-31 09:24:42 +13:00
Cyberboss
f7c9749ca0 Fixes some bad addtimer calls. Adds INVOKE_ASYNC. Replaces addtimer(..., 0) (#23424)
* Fixes some bad addtimers

* Adds INVOKE

* Warning for addtimer

* Working syntax

* Another bad call

* Fixes the addtimer warning

* Add suppress_zero_warning to addtimer

Useful for addtimer that uses vars

* Add INVOKE_AGAIN for when the var is already defined

* Replace addtimer(...,0) with INVOKE((...))

* Much more sensible syntax

* Less overhead, less copypaste

* Rename INVOKE_ASYNC

* Use a macro

* Allman style

* Wait, why make it a datum in the first place?

* Revert the rename

* Rename again, keep line endings

* typo

* More typos

* Untouches Addtimer

* Update callbacks.dm

* Update timer.dm

* Revert allman style

* Revert "Revert allman style"

This reverts commit 47361da15bd04eca138be5f13acdc9dd5ba89331.

* Trying to match that whitespace diff

* Why is this missing?

* I'm not fucking dealing with this!
2017-01-31 09:20:54 +13:00
AnturK
6470464ec1 Map Decals v.2 (#23385)
Simple decal system to replace turf stacking and icon state duplication.
Plus simple script to help with path updates that are bit more complicated that search&replace.
Fixes caution tiles turning into space.
Fixes flipped corner decals.
Fixes gas list property whitespace on replacing.
2017-01-30 10:20:39 +13:00
Leo
2947408e09 Revert "Turf decals + path update helper" 2017-01-26 17:03:25 -02:00
AnturK
bf20de19f6 Turf decals + path update helper (#22887)
* Decal + Path update helper initial

* decal definitions

* Changes

* Updated script

* Bugfix & some pep8

* Default paths in filter rules

* return to crash

* Removes unused paths.

* Removes redundant icon_states

* capitals

* Maps v6 - run out of comments
2017-01-26 22:59:17 +11:00
Joan Lung
9796779ea1 Volt Void is now a more useful scripture (#22897)
* Fixes targetted clockcult scripture not logging

* easy

* volt void

* big damage

* i knew
untimely

* i was
untimely

* i am
untimely

* hmm

* brief delay

* inaccurate
2017-01-23 08:06:57 +04:00
Kyle Spier-Swenson
12570805bd Closes the Pool. (#23150)
* Delete pool.dm

* Removes usage of PoolOrNew

* Wrap up
2017-01-22 16:00:23 -05:00
Joan Lung
8cbbceb120 Merge pull request #23079 from XDTM/PostPoster
Makes posters fall down if they fail the do_after
2017-01-18 14:59:16 -05:00
PJB3005
7356e80484 hey that should be everything except making it compile. 2017-01-17 22:08:27 +01:00
Cyberboss
0aaa975e9a Makes effects immune to spacewind 2017-01-17 14:50:12 -05:00
XDTM
2e26af1142 Makes posters fall down if they fail the do_after 2017-01-17 20:31:07 +01:00
Joan Lung
062b5c4013 clockwork catwalks 2017-01-15 14:53:01 -05:00
Jack Edge
9755818614 Fixes pyroclastic anomaly slime colour
The pyro anomaly was setting the color of the slime incorrectly, meaning
it had a red or orange color but had the wrong name (and probably core
type).
2017-01-11 19:44:25 +00:00
oranges
d228c1a4a5 Merge pull request #22529 from bgobandit/fuckinggoof
Portals can no longer be frozen.
2017-01-10 10:43:03 +13:00
Cheridan
4a03a77244 Merge pull request #22803 from ChangelingRain/tempoverlays
Changes a few things into temporary visual effects
2017-01-08 12:51:07 -06:00
bgobandit
a8b2d1f8b8 Foam no longer spreads to transit space turfs. (#22787)
* Foam no longer spreads to transit space turfs.

* Blacklists lava and chasms for foam; blacklists transit turf for xeno weeds

* wait wtf was I thinking
2017-01-07 19:42:42 +13:00
Mervill
8d505d0aa4 pre-placed posters don't retain their pixel offset when taken down carefully (#22760)
* pre-placed posters don't retain their pixel offset when taken down carefully

* use P.forceMove(location)
2017-01-07 19:40:39 +13:00
Joan Lung
b0f3a27261 Changes a few things into temporary visual effects 2017-01-06 16:45:36 -05:00
oranges
3a77966186 Merge pull request #22728 from XDTM/MechHole
Fixes wormholes not being usable by mechs
2017-01-06 09:58:29 +13:00
oranges
f21b077adc Merge pull request #22698 from ChangelingRain/supermattercount
The supermatter now has a ghost-visible damage display
2017-01-05 19:09:28 +13:00
XDTM
babe7a6aa6 Fixes portals not being usable by mechs 2017-01-04 15:56:50 +01:00
oranges
3607645380 Merge pull request #22693 from MrStonedOne/revert-22577-ACKACK
Revert "Fixes AIs being able to see cult runes"
2017-01-04 18:38:16 +13:00
Kyle Spier-Swenson
bee4b132a3 [READY]Makes addtimer use callbacks (#22660)
* Makes addtimer use callbacks

* I broke the comment

* I fucked up the regex

* this was a silly idea.
2017-01-04 16:02:56 +13:00