Xhuis
815c7aa435
ACTUALLY removes cauterize
2015-10-06 20:18:53 -04:00
Xhuis
527c7b568d
Removes Cauterize
2015-10-06 20:17:43 -04:00
Xhuis
dbab97bb34
Merge remote-tracking branch 'remotes/upstream/master' into wiz_spell
2015-10-06 20:12:42 -04:00
Xhuis
71861ccd1a
Conflicts 1/3
2015-10-06 20:12:21 -04:00
Razharas
156e0cabda
Finishes Kors PR
...
Finishes Kors PR
2015-10-06 23:14:06 +03:00
Razharas
33cc64b0a8
Merge pull request #12163 from Aranclanos/aliendryby
...
Removes alien driveby
2015-10-06 21:59:17 +03:00
Razharas
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
Xhuis
909849adc8
Tweaks
2015-10-06 10:33:14 -04:00
Razharas
9b710d7fcb
Merge pull request #12153 from duncathan/destroyfixes
...
Destroy() fixes
2015-10-06 09:27:41 +03:00
Razharas
2bce5455e6
Merge pull request #12166 from MrStonedOne/patch-43
...
Fixes orbit breaking on shuttle move.
2015-10-06 09:22:39 +03:00
Razharas
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
duncathan
81a1c9a8a2
missed a parent call
2015-10-05 19:06:59 -06:00
Xhuis
713c229935
Spell book refactor
2015-10-05 21:01:44 -04:00
Xhuis
df9c77aabf
Causes damage dealt back to be 50% of original damage
2015-10-05 17:58:14 -04:00
Xhuis
56ef6de4aa
Merge remote-tracking branch 'remotes/upstream/master' into wiz_spell
2015-10-05 17:55:44 -04:00
Xhuis
ae1e02013b
New wizard spell: Cauterize
2015-10-05 17:49:43 -04:00
Razharas
070eb882db
Merge pull request #12077 from GunHog/I_am_WJs_Code_Slave_Now
...
Royal Xeno Expansion!
2015-10-06 00:30:06 +03:00
Razharas
22a7a6d1bd
Merge pull request #12152 from MrStonedOne/patch-42
...
Removes unneeded overhead from datum pooling
2015-10-05 22:24:37 +03:00
Razharas
55e0c771d7
Merge pull request #12142 from Jordie0608/ivefoundareasonwhypollcodeislikethisbutamstilllookingforagoodreason
...
Create Poll fixes
2015-10-05 22:23:09 +03:00
Razharas
c87a9106c7
Merge pull request #12136 from Xhuis/my_chat_is_dying
...
Nar-Sie rune invocation changes
2015-10-05 22:22:18 +03:00
Razharas
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
Razharas
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
Razharas
b8378d2904
Merge pull request #12075 from KorPhaeron/thrallchange
...
Fixes thrall examine
2015-10-05 22:14:30 +03:00
WJohn
01ba1158fc
Merge pull request #11981 from Tokiko1/clothes-addition1
...
Small clothes addition.
2015-10-05 15:13:11 -04:00
GunHog
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
Xhuis
7c226b9b1b
Changes values on the Weakness symptom
2015-10-05 12:06:32 -04:00
Jordie0608
398a3ea1d1
unmagics polltypes into defines
2015-10-05 17:44:37 +11:00
Razharas
dd961ce261
Merge pull request #12096 from Iamgoofball/patch-127
...
Adds Bullshit Mode var to RAGIN MAGES
2015-10-05 09:31:01 +03:00
Iamgoofball
cfa151d800
Adds time check var for admins to tweak time in between wizard spawns
2015-10-04 22:13:48 -07:00
Razharas
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
Kyle Spier-Swenson
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
Kyle Spier-Swenson
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
Aranclanos
de0e469fba
Changes the facehugger paralyze of 20~ seconds to a 1 second weaken
2015-10-04 21:43:12 -03:00
Aranclanos
4d03f22943
Changes the tank suicide act to bruteloss instead of gibbing.
2015-10-04 20:16:39 -03:00
Remie Richards
4af9affc33
Merge pull request #12109 from MrStonedOne/orbittweak
...
Orbit tweaks!
2015-10-04 22:30:04 +01:00
duncathan
c98768df16
missed one
2015-10-04 08:10:28 -06:00
duncathan
1278b3e8ef
fixes #11870 ; removes every last out of place del() call or definition
2015-10-04 08:03:04 -06:00
Kyle Spier-Swenson
b9056a0528
Removes unneeded overhead from datum pooling
...
Protip: I did this from my
Fixes #12149
2015-10-04 06:59:48 -07:00
duncathan
6a316f1bba
fixes #11918
2015-10-04 07:39:00 -06:00
duncathan
4475824890
fixes #12143
2015-10-04 07:33:32 -06:00
Jordie0608
2b58c2ff6f
adds logging, auto-deletion of questions without options
2015-10-04 23:34:05 +11:00
Jordie0608
a190ae6c5c
adds cancel to inputs, fixes extracting only date
2015-10-04 17:56:06 +11:00
Razharas
0c925f2de5
Merge pull request #12116 from Xhuis/borg_why_did_you_let_me_die
...
Fixes Syndicate cyborg hyposprays not injecting properly
2015-10-04 07:22:58 +03:00
Xhuis
2cb92301db
Nar-Sie rune invocation changes
2015-10-03 22:47:59 -04:00
Razharas
653e5d18f3
Merge pull request #12027 from Fox-McCloud/advancedmop
...
Re-Adds Advanced Mop, Adds in Bluespace Trashbag, and Suds up the Janitor
2015-10-04 05:13:48 +03:00
Razharas
bac5ccd2c7
Merge pull request #12080 from Xhuis/doctors_delight_buff
...
Doctor's Delight changes
2015-10-04 05:09:42 +03:00
Xhuis
a556db1ac5
Removes an errant bracket
2015-10-03 21:55:25 -04:00
Xhuis
a1dd42b3c3
Virology tweaks and a new symptom
2015-10-03 21:51:24 -04:00
Razharas
92e5038fba
Merge pull request #11919 from Jordie0608/theresagoodreasonwhypollcodeislikethisijustdontknowwhatitis
...
In game interface for creating server polls
2015-10-03 18:18:09 +03:00
Razharas
9fdedcfefc
Merge pull request #12076 from Menshin/letsbeaheapstar
...
Some datastructures and A* tweaks
2015-10-03 18:15:23 +03:00
