Commit Graph

713 Commits

Author SHA1 Message Date
PJB3005
8ce6ae2b87 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-08 14:30:23 +01:00
kevinz000
0ced9342b9 [READY]Aimable wizard lightning bolts (#23723)
* ZAP!

* YOU DID NOT SEE THAT

* YOU DI NOT SEE THAT 2

* object orientated pr

* gdi

* protection

* object orientated pr v2

* REEEE

* blacklists

* Update magicarp.dm
2017-02-08 18:31:52 +13:00
oranges
35e9de7952 Merge pull request #23691 from JJRcop/valentinescucked
Adds love triangle to valentines day event
2017-02-06 18:38:05 +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
oranges
94f7c70c65 Merge pull request #23648 from coiax/notify-wizard-rod
The Rod Form spell does not notify deadchat
2017-02-05 00:09:12 +13:00
oranges
ea72c9decd Merge pull request #23639 from KorPhaeron/valentines
Buffs the valentines event
2017-02-04 23:53:39 +13:00
Pieter-Jan Briers
aeb057579e Hey it almost works 2017-02-04 01:00:12 +01:00
Jack Edge
91fbd27e4e The Rod Form spell does not notify deadchat
🆑 coiax
del: The wizard spell "Rod Form" does not produce a message in deadchat
everytime it is used.
/🆑

Because it gets spammy, and the joy of following a rod is being able to
watch its devestation. If you're following a wizard, you're already
following and need no notification.
2017-02-03 01:30:42 +00:00
JJRcop
79f706374b Adds love triangle to valentines day event 2017-02-02 19:58:49 -05:00
KorPhaeron
ceed418d06 While instead of for 2017-02-02 18:40:35 -06:00
KorPhaeron
d34787d98e Buffs the valentines event 2017-02-02 13:16:54 -06:00
coiax
47a1da9bcb Removes minimum round time from abductor event (#23500)
🆑 coiax
add: The Abductor event can now happen at any time, rather than thirty
(30) minute plus rounds.
/🆑

- We have the xeno event that can fire at any time, and that's way more
round affecting than ayys. Ayys are fun, and we don't get to see them
except with admin memes.
2017-02-01 20:38:11 +01:00
oranges
a6fa62f2d4 Merge pull request #23449 from coiax/removes-underscore
Removes underscore from blob event
2017-01-31 09:30:35 +13:00
Cyberboss
3f7f5d4000 Removes/Refactors /mob/unEquip (#22918)
* Part1

* IT COMPILES!!!!

* Fuck wait this was missing from that last

* Update handlabeler.dm

* Update handlabeler.dm

* Fixes n shit

* Fix this

* Fixes #23310

* Fucking @RemieRichards was right

* Fixes devil unEquip

* WTF ARE BITFLAGS?

* THERES THE FUCKING PROBLEM

* Fixes
2017-01-31 09:28:31 +13:00
Cyberboss
2aef76bdce Nuclear bombs now actually detonate (#22586)
* BOOM

* Forgot this check

* Fix remaining objectives

* This is better

* MSO params

* >When you copy paste directly from the comment

* Merge fixes

* Revert "Fix remaining objectives"

This reverts commit b1d1bf40f615019bb57088c24fae8f89c5d2e834.

* Revert "Forgot this check"

This reverts commit cea6ad2381d44a44ef3a93064997454cf7b1ccf5.

* After all that work I did to make objectives work...

* Oh this is important
2017-01-30 09:41:42 +13:00
Fox McCloud
06564598ee Botany Fixes (#23404)
* Botany Fixes

* styling

* further fixes

* explosive vine fix
2017-01-29 13:41:52 +01:00
Jack Edge
c12c3ac0ed Removes underscore from blob event
Removes a rogue underscore from the descriptive text.
2017-01-29 04:18:20 +00:00
coiax
7671cb2ae6 Modifies the Human-level Intelligence Event (#23375)
🆑 coiax
add: The Human-level Intelligence event now occurs slightly more often,
and produces a classified message.
/🆑

- This has been harmless enough, right now the probability chance is
actually BELOW gateway swarmers, which is a bit silly.
- Some notification for the station so they can start looking for a
cockroach/mouse with opinions, or check the slime pens.
- Speaking of gateway swarmers, it produces the same classified message
notification, to keep people on their toes.
- Also I love madlib descriptions.
2017-01-28 01:05:06 -06: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
c93ce5ae83 Syndicate commandos will now leave gibs (#23062) 2017-01-18 12:11:00 -05:00
PJB3005
7356e80484 hey that should be everything except making it compile. 2017-01-17 22:08:27 +01:00
oranges
541c8ad135 Merge pull request #22845 from Core0verload/equipment_fix
Refactor of outfits datums and corpse spawners
2017-01-10 10:10:10 +13:00
c0
0b311121d9 Refactor of outfits datums and corpse spawners 2017-01-08 10:30:31 +03:00
bgobandit
4520e393f7 Fixes the admin message for morph, devil and slaughter demon spawns. (#22770)
* Morphling logs ckey correctly

* refactors every other spawn event apparently

* fixes a typo while I'm in the file
2017-01-07 19:41:39 +13:00
bgobandit
945d4f060f The Floor Is Lava and Advanced Darkness work again. (#22780)
* The Floor Is Lava and Advanced Darkness work again.

* define memes
2017-01-06 16:55:45 -05:00
XDTM
babe7a6aa6 Fixes portals not being usable by mechs 2017-01-04 15:56:50 +01:00
KorPhaeron
010f305ee2 Fixes portals moving anchored atoms (#22587)
* Fixes portals moving anchored objects

* Missing a letter

* Mecha
2017-01-02 15:07:11 +01:00
oranges
0010f34a1c Merge pull request #22432 from coiax/stops-sentient-event-complaining
Adds correct returns to sentience event
2016-12-26 14:53:24 +13:00
XDTM
bf9492b0f3 Maybe fixes kudzu 2016-12-26 01:45:49 +01:00
Jack Edge
a257df3e45 Adds correct returns to sentience event
I coded the ghost_role template, and yet I failed to code a new event
correctly.

I have fixed my mistakes, the sentience event no longer produces admin
complaints about bugs.
2016-12-24 13:31:20 +00:00
Incoming5643
123426b9c9 Fixes all the occasions where a wizard could find/make sandals and get the nerfed sandals instead of the new ones introduced in #22164 (#22237) 2016-12-17 14:22:46 -05:00
coiax
43a08412a3 Anomalies now have observer-visible countdowns (#22147)
* Anomalies now have observer-visible countdowns

🆑 coiax
add: Anomalies now have observer-visible countdowns to their detonation.
/🆑

- Behind the scenes, moved the detonation code from the event to the
anomalies themselves. May be some differences of lifespan, given we're
going from event ticks to world.time, but meh.

* Changes the name of the anomaly cores
2016-12-16 11:08:05 +13:00
coiax
18647dd3d6 Added "Sentience" rare random event (#22007)
* Added "Sentience" rare random event

🆑 coiax
add: Due to a combination of radiation and water supply contamination,
stations have been reporting animals gaining self awareness.
/🆑

Picks a random /mob/living/simple_animal on station that has no mind,
and gives it to a ghost who signs up, along with giving them a decent
chunk of health so they don't die instantly.

Note that this does include bots, which I've kept because it's hilarious
that the Mulebot spontaneously develops opinions.

Cockroaches now take 1 damage when stepped on, enough to kill a normal
cockroach, but not enough to kill a sentient one.

* Changed min() to max()

* Changed lore to appease Cheridan
2016-12-10 10:04:56 +13:00
coiax
fcde5ac45d Enables the mice migration event (#21982)
* Enables the mice migration event

🆑 coiax
add: Additional mice sometimes appear in the maintenance tunnels.
Engineers beware!
/🆑

I probably had too much fun writing this.

* Fixes grammar mistake

OOC: Thunder12345: not more than 15 of rodents
2016-12-08 12:42:59 +13:00
Razharas
4993e2146b Merge pull request #21888 from XDTM/VineCodeScaresMe
Fixes a couple of kudzu bugs
2016-12-03 21:26:17 +04:00
XDTM
628f1fffe2 ) 2016-12-03 17:05:08 +01:00
XDTM
26b951d917 Fixes fixes 2016-12-03 16:57:37 +01:00
Mervill
c2e2440953 Merge branch 'master' into w_class
Conflicts:
	code/game/objects/items/weapons/twohanded.dm
2016-12-02 21:44:24 -08:00
XDTM
e57eac4ffd Proper color init 2016-12-02 10:29:26 +01:00
Mervill
09ea5ad2e5 w_class now uses defines 2016-12-01 21:33:14 -08:00
XDTM
fc8d1d6be3 Fixed bugs 2016-12-02 00:46:49 +01:00
Mervill
01d4232570 Remove slash from end of type refs/defs 2016-11-30 19:23:15 -08:00
Lzimann
2e8ef6c356 Adds the spawner to the maps 2016-11-25 19:25:48 -02:00
Lzimann
89a03ef577 Adds a new spawn xmas tree landmark and also adds a new holiday, the festive season. 2016-11-25 19:01:53 -02:00
coiax
ef42272bf6 Mice no longer spawn on grilles (#21603)
* Mice no longer spawn on grilles

Fixes #21574. Mice no longer spawn on cables that have dense objects
also on the tile.

Also added the Mice Migration event, used for debug purposes, currently
disabled.

* Uses proc that exists to check for density
2016-11-19 22:28:41 +13:00
phil235
0876b424a7 Tiny fixes and suggested changes.
Blight ability will still color your hair, and will be cleared when cured.
2016-11-01 01:59:23 +01:00
phil235
2dc956bea0 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
# Conflicts:
#	code/game/gamemodes/clock_cult/clock_scripture.dm
#	code/game/gamemodes/clock_cult/clock_structures.dm
2016-10-31 19:59:00 +01:00
bgobandit
e7d0db78f1 The creepy clown epidemic has arrived at Space Station 13. (#21164)
* Implements a full spooky clown event for halloween.dm

* temp

* made requested fixes

* reeeee

* Clowns actually work now. Minor refactors to hallucination thanks oranges

* CLOWNS FINALLY WORK PROPERLY JESUS FUCK

* Fix incorrect prob method call
2016-10-30 19:51:19 +13:00
Shadowlight213
3d3fef9998 changes so only humans and lizards 2016-10-29 22:29:45 -07:00
Shadowlight213
d01b76172d removes species change from Halloween event 2016-10-29 22:05:29 -07:00