Commit Graph

11503 Commits

Author SHA1 Message Date
Cheridan
f7175c19a2 Merge pull request #12660 from RemieRichards/ShoulderParrots
Player Parrots can now sit on a Human's shoulders.
2015-10-28 16:35:36 -05:00
Cheridan
7c8a4c944c Merge pull request #12696 from KorPhaeron/redunzgofastah
Slime potion fix
2015-10-28 15:52:39 -05:00
Razharas
0efc44c12c Merge pull request #12688 from MrStonedOne/patch-52
Golem runes no longer trigger on ghosts orbiting something
2015-10-28 22:24:14 +03:00
Razharas
ee555c6a5c Merge pull request #12682 from Incoming5643/demonic_blinking_goose
Fixes icon blinking on level five singularities
2015-10-28 19:31:39 +03:00
Cheridan
9397bb4862 Merge pull request #12675 from Firecage/Xenobegonefrommytable
Makes it so only advanced tool users can use tablecrafting.
2015-10-28 08:22:29 -05:00
Razharas
9357602233 Merge pull request #12665 from tkdrg/ghost_medsechuds
[READY] Adds a ghost on-screen HUD
2015-10-28 05:19:19 +03:00
Tkdrg
dd20530f0e Adds ghost alerts.
Adds ghost alerts for revival (cloning, MMIs, nar-sie, drones, etc).
2015-10-27 23:07:41 -03:00
Razharas
4a6840b057 Merge pull request #12676 from KorPhaeron/energycannon
Fixes admin spawned energy cannons/emitters
2015-10-28 04:31:12 +03:00
Razharas
e3c87713d5 Merge pull request #12668 from Shadowlight213/Syndiemobblock
Syndicate melee mob tweaks.
2015-10-28 02:45:52 +03:00
Incoming5643
9d32d5b5ce Don't code with the web interface, kids 2015-10-27 19:43:45 -04:00
KorPhaeron
1f0cf5b651 Embarrasing 2015-10-27 14:44:11 -05:00
Tkdrg
a87af40beb Adds ghost sec/med huds. Adds new ghost HUD icons
Thank you Razharas for the icons.
2015-10-27 14:32:46 -03:00
Incoming5643
2352d34036 Don't code while sleep deprived kids 2015-10-27 11:41:23 -04:00
Razharas
a821bb86d7 Merge pull request #12671 from MrStonedOne/patch-51
Fixes arrivals shuttle getting destroyed breaking observing.
2015-10-27 18:34:14 +03:00
Razharas
0ab03947e6 Merge pull request #12647 from tkdrg/o_o
Adds googly eyes for animated mimics
2015-10-27 18:30:28 +03:00
Razharas
ba1b70106d Merge pull request #12497 from bgobandit/ayyyfixes
Even more xenobiology fixes and tweaks
2015-10-27 18:28:48 +03:00
Kyle Spier-Swenson
77db6d2dd4 Golem runes no longer trigger on ghosts orbiting something
This can be annoying when you are orbiting someone and they walk over a golem rune.

It also could be used to tell who ghosts are orbiting, also bad.
2015-10-27 07:45:03 -07:00
Razharas
05c9969d0c Merge pull request #12672 from MrStonedOne/setupcharallmobs
Adds the ability to access game preferences while not in lobby
2015-10-27 16:38:16 +03:00
Razharas
e0ab2b582c Merge pull request #12495 from Anonus/switchblades
Massively buffs timestop effects
2015-10-27 13:58:11 +03:00
Razharas
9c78cc9e56 Merge pull request #12584 from KorPhaeron/redunzgofastah
New red slime speed potion
2015-10-27 13:57:13 +03:00
KorPhaeron
e51845a457 Typing is hard 2015-10-27 03:49:31 -05:00
KorPhaeron
44cbf04cdb Lets err on the side of weak to guns actually 2015-10-27 03:49:18 -05:00
KorPhaeron
03ad586cb8 No instant heals 2015-10-27 03:45:35 -05:00
Jordie
b22e0801a8 Merge pull request #12539 from KorPhaeron/pillshere
Zombies
2015-10-27 19:38:39 +11:00
KorPhaeron
926c0be367 Less health 2015-10-27 03:14:37 -05:00
KorPhaeron
8a40ddc7d8 Forgot a line 2015-10-27 02:37:24 -05:00
KorPhaeron
e2e9be42b8 Zombie fixes 2015-10-27 02:35:00 -05:00
Incoming
2825d2a6f2 apparently you have to give switch() some personal space 2015-10-27 02:24:34 -04:00
Incoming
11ae42e9cf Fixes icon blinking on level five singularities
What had happened: when stage six was added stage five's survivability took a stealth nerf, because any time the singularity reached enough energy to go six but hadn't eaten a supermatter shard (read: almost ever time) it would be force set to 2000 energy.

The problem: 2000 energy is the verge of stage four, so every time this hard set was hit (and for a hungry singulo this could be every consume check) the energy would be set to 2000. Then, at the same time, the singulo would suffer a little energy loss, momentarily become level four. Then, still all the same breath here, any new items would be eaten, pushing it back into level five.

Thus the singulo blinked.

As far as I can tell this was an unreported issue.
2015-10-27 02:11:25 -04:00
Cheridan
856164ecf4 Merge pull request #12659 from Anonus/catbuff
Cat buff: There's cat hair in the vents!
2015-10-26 21:04:21 -05:00
Tkdrg
1ca8237dba Readds ghost verbs. Makes the ghost HUD togglable 2015-10-26 22:57:08 -03:00
Shadowlight213
ed11271a3a Removes redundant code 2015-10-26 18:11:42 -07:00
KorPhaeron
714dba55b5 Fixes energy cannons 2015-10-26 19:35:14 -05:00
Cheridan
6dffb5f65d Merge pull request #12257 from KorPhaeron/map_loader
Small map loader update
2015-10-26 19:11:52 -05:00
Firecage
26bbd93522 Makes it so only advanced tool users can use tablecrafting. 2015-10-27 02:01:47 +02:00
Cheridan
4ded0027ea Merge pull request #12649 from Incoming5643/why_cant_I_hold_all_these_hands
Fixes dropable bloodcrawl hands
2015-10-26 16:46:20 -05:00
Razharas
39d861cf44 Merge pull request #12043 from kingofkosmos/firescreenalert
Screen alert for being on fire
2015-10-26 19:17:40 +03:00
Remie Richards
a0e79284a1 Shoulder Parrots no longer provide immunity to Slimes, rofl. 2015-10-26 14:51:51 +00:00
MrStonedOne
6f6654436f The Game Preferences verb now opens directly to the game settings tab. 2015-10-26 07:51:20 -07:00
MrStonedOne
3303176f14 Adds the ability to access game preferences while not in lobby
Also removed a few preferences_toggles verbs that are no longer needed.

Haven't tested this too much yet, but from what I can tell, no ill effects of doing this have been observed.
2015-10-26 06:57:20 -07:00
Kyle Spier-Swenson
2f149c7361 adds span class to failed to teleport warning 2015-10-26 05:35:10 -07:00
Kyle Spier-Swenson
38bae5f833 Fixes arrivals shuttle getting destroyed breaking observing. 2015-10-26 05:31:16 -07:00
Shadowlight213
a1c5385e38 Re-adds ranged block 2015-10-26 00:54:22 -07:00
Shadowlight213
f11b9ef0a4 Removes melee syndicate block chance as it was snowflake and buggy, and increased their health to compensate. 2015-10-26 00:29:28 -07:00
Tkdrg
8e775a18ff Adds a ghost on-screen HUD
Removes the ghost verbs and adds an on-screen HUD.
2015-10-26 03:22:29 -03:00
Cheridan
98ac2dfd9f Merge pull request #12642 from tkdrg/FUCKpaprikaNIGGER
Improves starlight performance
2015-10-26 00:35:52 -05:00
KorPhaeron
7de9f6cc68 Clean 2015-10-25 23:54:51 -05:00
Remie Richards
234c3b76fb Player Parrots can now sit on Human's shoulders. 2015-10-26 02:33:44 +00:00
Nerd Lord
6b0ecfed4b Buffs cats. Cats can now ventcrawl, walk over tables, take less damage from lacking air(and will thus survive longer in boxes with radiation) and can live in slightly higher and lower temperatures. 2015-10-25 22:16:25 -04:00
Razharas
bf8cdc2896 Merge pull request #12627 from tkdrg/admin_antag_HUD
Adds Admin-only Antag HUDs
2015-10-26 03:57:07 +03:00