7242d12cb0
Merge pull request #12159 from Aranclanos/tanksuicide
...
Changes the tank suicide act to bruteloss instead of gibbing.
2015-10-06 21:52:49 +03:00
3f0731fab3
Fixes medborgs injecting mobs without reagents with their hypospray
2015-10-06 15:31:01 -03:00
7420f27c9b
Conflicts 3/3
2015-10-06 11:24:36 -04:00
038a5ba891
Conflicts 2/3
2015-10-06 11:22:26 -04:00
276d6e5d68
Conflicts 1/3
2015-10-06 11:22:16 -04:00
909849adc8
Tweaks
2015-10-06 10:33:14 -04:00
b380b972be
Fixes Revenant speech being heard in the lobby
2015-10-06 00:43:47 -07:00
4ef92617df
Moves commented out code portion to the Stage 0 part of blob code. This way the blob still has the same amount of time to prepare before it is announced.
2015-10-06 00:36:07 -07:00
9b710d7fcb
Merge pull request #12153 from duncathan/destroyfixes
...
Destroy() fixes
2015-10-06 09:27:41 +03:00
2bce5455e6
Merge pull request #12166 from MrStonedOne/patch-43
...
Fixes orbit breaking on shuttle move.
2015-10-06 09:22:39 +03:00
9a6c858182
Adds a return to stage 0.
2015-10-05 23:22:16 -07:00
29b313d3b8
Merge pull request #12167 from MrStonedOne/patch-44
...
Tweaks mc's default dynamic wait buffer down a bit.
2015-10-06 09:22:15 +03:00
a9e7b0901f
Removed Delcared var that isn't used anywhere
2015-10-05 23:11:44 -07:00
c6603628f6
Removes the classified report from the blob gamemode.
2015-10-05 23:06:23 -07:00
d328b8be17
Fixes drone reviving
2015-10-06 01:59:56 -04:00
d1d7fb932c
Adds logging and admin announce to admin ghosting.
2015-10-05 20:56:15 -07:00
c1031a5a66
removes admin announce from follow.
...
This was only kept because it was the only easy way to claim an admin help.
Because starting to type a response to an admin help announces, this is no longer necessary
2015-10-05 20:48:07 -07:00
a16260d693
Removes cult scaling
2015-10-05 18:19:02 -07:00
81a1c9a8a2
missed a parent call
2015-10-05 19:06:59 -06:00
713c229935
Spell book refactor
2015-10-05 21:01:44 -04:00
e2ed83b6a5
adds the del() log to world.log at roundend and allows the runtime condenser to parse and condense it
2015-10-05 18:52:44 -06:00
df9c77aabf
Causes damage dealt back to be 50% of original damage
2015-10-05 17:58:14 -04:00
56ef6de4aa
Merge remote-tracking branch 'remotes/upstream/master' into wiz_spell
2015-10-05 17:55:44 -04:00
ae1e02013b
New wizard spell: Cauterize
2015-10-05 17:49:43 -04:00
070eb882db
Merge pull request #12077 from GunHog/I_am_WJs_Code_Slave_Now
...
Royal Xeno Expansion!
2015-10-06 00:30:06 +03:00
22a7a6d1bd
Merge pull request #12152 from MrStonedOne/patch-42
...
Removes unneeded overhead from datum pooling
2015-10-05 22:24:37 +03:00
55e0c771d7
Merge pull request #12142 from Jordie0608/ivefoundareasonwhypollcodeislikethisbutamstilllookingforagoodreason
...
Create Poll fixes
2015-10-05 22:23:09 +03:00
c87a9106c7
Merge pull request #12136 from Xhuis/my_chat_is_dying
...
Nar-Sie rune invocation changes
2015-10-05 22:22:18 +03:00
72af620748
Merge pull request #12135 from Xhuis/oh_god_my_eyes_are_bleeding
...
Virology symptom tweaks and a new symptom
2015-10-05 22:21:34 +03:00
87c9960d6c
Merge pull request #12102 from bgobandit/singlotips
...
FIXES SINGULARITY BEACON AND POWERSINK TEXT, IT WORKS, I DON'T CARE, FUCK
2015-10-05 22:16:00 +03:00
b8378d2904
Merge pull request #12075 from KorPhaeron/thrallchange
...
Fixes thrall examine
2015-10-05 22:14:30 +03:00
01ba1158fc
Merge pull request #11981 from Tokiko1/clothes-addition1
...
Small clothes addition.
2015-10-05 15:13:11 -04:00
45aee25f74
Royal Inhands
...
- Gives unique facehugger inhands to match the larger sprites of teh
royals.
I apologize in advance for the horrible coding. I cannot into sprites.
2015-10-05 12:43:42 -05:00
7c226b9b1b
Changes values on the Weakness symptom
2015-10-05 12:06:32 -04:00
832a3dcf90
Generalizes deflection to all martial arts
2015-10-05 12:01:31 -04:00
385bd9ac14
This might be a bad idea.
2015-10-05 15:02:11 +02:00
b7a1ee7cfa
Adds display case repair
2015-10-05 13:07:58 +02:00
fde2d23e12
Changes lone op tc
2015-10-05 12:14:18 +02:00
8959858f41
Lone Operative Event
2015-10-05 12:14:17 +02:00
ed8e252d00
Gamemode override for uplinks
2015-10-05 12:13:37 +02:00
b173004231
Nukeop Outfits
2015-10-05 12:13:37 +02:00
398a3ea1d1
unmagics polltypes into defines
2015-10-05 17:44:37 +11:00
dd961ce261
Merge pull request #12096 from Iamgoofball/patch-127
...
Adds Bullshit Mode var to RAGIN MAGES
2015-10-05 09:31:01 +03:00
d33ead1350
Fixes an src
2015-10-04 22:48:59 -07:00
cfa151d800
Adds time check var for admins to tweak time in between wizard spawns
2015-10-04 22:13:48 -07:00
f05d5e1d61
Adds config option for allowing webclient.
...
Also adds a config option to restrict webclient to byond members only.
2015-10-04 21:06:45 -07:00
3a10e2384b
Merge pull request #12104 from Xhuis/free_drone
...
A few drone tweaks (now with 100% less emagging!)
2015-10-05 07:00:36 +03:00
77441b42c7
Kicks now inform you who kicked you.
2015-10-04 19:39:45 -07:00
6b92275c66
Tweaks mc's default dynamic wait buffer down a bit.
...
dynamic wait buffer is the amount subtracted off of the process cost before calculating the new dynamic wait.
1.5 was too much and dynamic wait wasn't kicking in until after atmos was causing lag, 0.7 seems much better after testing on sybil.
2015-10-04 18:58:28 -07:00
997d86684a
Fixes orbit breaking on shuttle move.
...
Fixes #12160
I moved this check out of the while because I didn't want to have to trigger two separate calls to get_turf.
Also fixes an edge case where orbiting a turf could cause runtimes.
2015-10-04 18:46:42 -07:00
Razharas
Aranclanos
Xhuis
Shadowlight213
Kyle Spier-Swenson
KorPhaeron
duncathan
WJohn
GunHog
Pieter Vlasblom
AnturK
Jordie0608
Iamgoofball