Commit Graph

19795 Commits

Author SHA1 Message Date
Crazylemon64
64c92bf400 Ports Morph
Refactors a bunch of lesser antag mobs into gamemodes/miniantags
2016-01-15 16:31:58 -08:00
TheDZD
c32d9cef2e Merge pull request #3233 from Fox-McCloud/human-creation-fix
Fixes Human Creation and Cuts its Cost
2016-01-14 20:20:41 -05:00
Fox-McCloud
6d48553980 Fixes Human Creation and Cuts its Cost 2016-01-14 19:21:39 -05:00
Fox McCloud
3e3ee577ad Merge pull request #3228 from Jey123456/monkeycubelagfix
fix for monkeycube expand related lag.
2016-01-14 17:43:11 -05:00
Tigercat2000
e105450a16 fix hijack too 2016-01-14 14:38:39 -08:00
Jey
37091bb2f3 - removed the throttle on monkeycube expansion. 2016-01-14 17:34:09 -05:00
Tigercat2000
9baf614f82 I hate objectives 2016-01-14 13:55:42 -08:00
Jey
f1e4e2a787 fix for monkeycube expand related lag.
changed the new human call instead of using set_species incidently dropping the number of delete from ~50 to ~10 per monkey cube.

added a limit to monkeycube expand to only expand one every 0.2 second instead of doing them all at once in the event of a mass expand.
2016-01-14 13:05:22 -05:00
TheDZD
a4c9219dd6 Merge pull request #3220 from Fox-McCloud/startup-fix
Fixes Server Startup Times
2016-01-13 20:00:54 -05:00
TheDZD
aba1f70e14 Merge pull request #3211 from Fox-McCloud/explosion-tweak
Explosion Overhaul
2016-01-13 19:59:50 -05:00
Fox-McCloud
8f280b38c8 Fixes Server Startup Times 2016-01-13 19:49:48 -05:00
TheDZD
e0b854ce32 Merge pull request #3179 from Kyep/blob_vs_virus
Blob vs virus
2016-01-13 16:09:22 -05:00
TheDZD
c2ad89b0ec Merge pull request #3200 from Fox-McCloud/clone-damage
Clone Damage Fix
2016-01-13 16:05:10 -05:00
TheDZD
25920c8b70 Merge pull request #3213 from Fox-McCloud/revolver-fix
Fixes Revolver Spin Runtime
2016-01-13 16:00:17 -05:00
Fox-McCloud
d1b90257c3 proper typecasting 2016-01-13 15:55:42 -05:00
Fox-McCloud
2541c8f4b6 faster loops 2016-01-13 09:08:53 -05:00
Kyep
d6237b83ca Reclassified events based on github feedback
Blob is now "level 5 biohazard", spacevine is now "level 7 biohazard",
viral infection is now "level 7 viral biohazard" and viral outbreak is
now "level 7 major viral biohazard". This is very close to how it was
originally, the only changes being (A) viral infection moving from 5 to
7, which the other viral event was already at anyway, and (B) viral
outbreak being called 'major viral' instead of just 'viral' so outbreaks
and infections are subtly different. This makes it a little easier to
distinguish blob (now the only 5) from the others, and still preserves
the numbered levels, making the handling of virus events slightly more
consistent in the process. If you want to stick with numbered levels,
I'd like to split them up a bit more (as tigercat suggested), but I
cannot make new sound/AI/outbreak*.ogg files, so this is a compromise
which makes blob a little easier to distinguish, makes viruses more
consistent, and does so without requiring new sound files.
2016-01-13 01:39:17 -08:00
Fox McCloud
517692d485 Merge pull request #3203 from Tastyfish/multipens
Added multicolor pens for NT Rep, Magistrate, and IAA
2016-01-13 02:35:03 -05:00
Fox McCloud
f137005432 Merge pull request #3212 from Crazylemon64/fun-is-the-best
Makes everything wonderful
2016-01-13 00:06:27 -05:00
Fox-McCloud
db90f5118b Fixes Revolver Spin Runtime 2016-01-13 00:04:09 -05:00
Fox-McCloud
eb5fcba6c5 Explosion Overhaul 2016-01-12 18:46:10 -05:00
Tastyfish
adb2edc85a Adds multicolor pens and makes gold & fountain pen subtypes 2016-01-12 00:02:26 -05:00
Fox McCloud
82b84421cf Merge pull request #3198 from CrAzYPiLoT-SS13/master
Footsteps fix
2016-01-11 22:24:20 -05:00
Fox McCloud
bfd3eb2a9d Merge pull request #3188 from Crazylemon64/poor-communication-kills
Bomb guardians notify their master when they ready a bomb
2016-01-11 21:06:51 -05:00
Fox-McCloud
a746786ee0 Clone Damage Fix 2016-01-11 20:56:00 -05:00
CrAzYPiLoT
626c8b4c26 Footsteps fix
Fixes half of #2786, other half has already been fixed
2016-01-11 23:56:33 +01:00
Crazylemon
499b967aaf Fun is the best, have it always
This reverts commit e6842e216a.
2016-01-11 13:12:34 -08:00
Tastyfish
8527933115 Fixed tcomms machines to be deconstructable 2016-01-11 04:08:46 -05:00
FalseIncarnate
7b581a8150 Revolver Fixes
Fixes the revolver being named "revolver" instead of ".38 Mars Special"
(was an issue even before #2722, but no one besides Fox seemed to
realize that due to the way the code was)

Fixes revolvers not actually getting the Spin verb to spin the chambers
as advertised in #2722
- verb and proc are similar, yet different.
2016-01-11 01:47:18 -05:00
Fox McCloud
a2f944cfd9 Merge pull request #2722 from ZomgPonies/russian
Revolver Stuff
2016-01-11 00:18:21 -05:00
TheDZD
1a87817add Merge pull request #3189 from Fox-McCloud/more-optimizations
More Mutadone Optimizations
2016-01-10 23:29:03 -05:00
TheDZD
3c8ec5fd1a Merge pull request #3181 from Fox-McCloud/remove-organs
Removes Organs
2016-01-10 23:27:12 -05:00
TheDZD
72f124d1b6 Merge pull request #3177 from Fox-McCloud/armory-tweak
Armory Tweak
2016-01-10 23:26:38 -05:00
TheDZD
7562c07d00 Merge pull request #3174 from Fox-McCloud/tradable-telecrystals
Adds in Tradable Telecrystals
2016-01-10 23:25:30 -05:00
Fox-McCloud
81da5906c8 even more optimization 2016-01-10 21:02:00 -05:00
Fox-McCloud
34fbc33c38 More Mutadone Optimizations 2016-01-10 19:35:54 -05:00
TheDZD
4941d804fa Merge pull request #3184 from ParadiseSS13/revert-3166-Tail-Fix
Revert "Fixes Tails Overlaying Arms"
2016-01-10 18:17:12 -05:00
Fox McCloud
f42db0f8b8 Merge pull request #3180 from Kyep/obsannoyance
Clarified confirmation prompts for ghosting
2016-01-10 18:04:49 -05:00
Fox McCloud
47dd494651 Merge pull request #3173 from tigercat2000/nano_javashript
NanoUI Shit (Part 3) - JavaShit
2016-01-10 18:04:22 -05:00
Crazylemon64
1fb0a336a7 Bomb guardians notify their master when they ready a bomb
Summmoners can't trip their own guardian bombs, for good measure

Bomb guardian summoners can now safely defuse their guardian's bombs
2016-01-10 13:51:44 -08:00
Fox-McCloud
f4b82fed69 Fixes Mutadone Causing Massive Performance Issues 2016-01-10 09:52:52 -05:00
Fox McCloud
274b9df69f Revert "Fixes Tails Overlaying Arms" 2016-01-10 08:04:07 -05:00
Fox-McCloud
369e95890c Removes Organs 2016-01-10 04:47:29 -05:00
Kyep
41d84eb2f8 Clarified confirmation prompt for chars ghosting while alive 2016-01-10 00:00:42 -08:00
Kyep
e73b84abd4 Clarified new_player observation button message
Previous message stated 30 minutes. This was wrong.
2016-01-09 23:59:45 -08:00
Kyep
a48ee3af05 Making virus v blob v vine clearer 2016-01-09 23:44:18 -08:00
Kyep
d00039f971 Made virus v blob v spacevine clearer 2016-01-09 23:43:36 -08:00
Kyep
3e39a352a5 clarifying Blob vs Virus vs Spacevine 2016-01-09 23:41:53 -08:00
Kyep
21171a35f5 clarifying Blob vs Virus 2016-01-09 23:41:10 -08:00
TheDZD
f36e636d4b Merge pull request #3166 from KasparoVy/Tail-Fix
Fixes Tails Overlaying Arms
2016-01-09 23:52:26 -05:00