f0735982dc
Merge pull request #13799 from KorPhaeron/admin_items
...
Fixes Grey Tide exploits
2015-12-20 03:50:13 -03:00
bde3995bc1
Merge pull request #13790 from tkdrg/niggers
...
Fixes invisible mask exploits
2015-12-19 23:10:05 -06:00
862f7e3510
Merge pull request #13775 from RemieRichards/get_turf_pixel+matrix_improvements
...
get_turf_pixel() improvements and matrix helpers
2015-12-19 23:26:44 -03:00
0c1855ea18
Merge pull request #13777 from Xhuis/totally_not_for_an_upcoming_project
...
Merges all things related to side-/mini-antagonists into a single folder
2015-12-19 23:24:33 -03:00
eae269d30a
Merge pull request #13819 from KorPhaeron/deepstrike2
...
Assault Pod Fix
2015-12-19 23:21:50 -03:00
c01e4d10a4
Merge pull request #13792 from Incoming5643/isnt_one_tail_bad_enough
...
Fixes weird lizard feature issues
2015-12-19 23:17:09 -03:00
c75a038676
Merge pull request #13796 from KorPhaeron/AI_follow
...
Clicking the (F) link on AI speech while make you orbit their camera eye
2015-12-19 23:15:46 -03:00
df3fd0da7c
Merge pull request #13258 from AndrewJacksonThe2nd/inventing_like_its_1891
...
Adds the Tesla Engine to the game.
2015-12-19 23:10:28 -03:00
c80b07d65e
Trailing space
2015-12-19 20:08:08 -06:00
34733cf01c
fuck shit pornhub
2015-12-19 18:01:05 -08:00
6207d9e052
haha whoooopppppppsssss
2015-12-19 17:52:06 -08:00
0d65351d3f
fixes
2015-12-19 17:51:11 -08:00
56be042744
fixes
2015-12-19 17:35:30 -08:00
dabbb02297
Upgrades orbit to use remie's new features, fixes ball movement.
2015-12-19 16:38:32 -08:00
664245db99
Merge pull request #13791 from MrStonedOne/patch-91
...
Orbit fixes
2015-12-19 18:35:46 -06:00
dd2b645951
Assault Pod Fix
2015-12-19 18:13:29 -06:00
450b7ebd1a
Merge pull request #13763 from AnturK/medfix
...
Medbeam Fixes
2015-12-19 16:55:14 -06:00
5fd85edfb1
Energy ball no longer claims it is a singularity.
2015-12-19 13:04:16 -08:00
1ab5e80458
Tesla map removal to fix merge
2015-12-19 12:32:50 -08:00
21165f77f5
i heard that sleep in process is a bad idea
2015-12-19 12:27:42 -08:00
0037ab3337
removes debug messages
2015-12-19 12:27:40 -08:00
7881d26981
WHOOPS FORGOT TO REVERT THIS
2015-12-19 12:27:37 -08:00
9582db7247
Adds the Tesla Engine to the game.
2015-12-19 12:27:32 -08:00
52d30c8870
Merge pull request #13761 from KorPhaeron/prayers
...
Admins can claim prayers
2015-12-19 11:48:11 -06:00
e873395ffa
Merge pull request #13659 from bgobandit/beepskyfunremoval
...
Beepsky will no longer hunt aliens.
2015-12-19 02:49:33 -03:00
c5c0b6cc74
Extra checks for grey tide
2015-12-18 22:41:13 -06:00
c0e571c61d
Merge pull request #13701 from tkdrg/calt
...
Cult fixes/tweaks
2015-12-19 15:07:48 +11:00
4adb440940
Merge pull request #13758 from KorPhaeron/deepstrike2
...
Gives the nuke ops an assault pod in place of their teleporter
2015-12-19 01:03:39 -03:00
d7c793f7b3
Inconsistent indents
2015-12-18 21:27:25 -06:00
50336adf58
Assault pod fixes
2015-12-18 21:15:44 -06:00
b621fb10d5
Removes special handling for mutant features on cloning. It didn't work and is inconsistent with how the rest of cloning works (it takes a snapshot of how you looked at the moment of death, including things that might not strictly be "genetic" like dyed hair color).
2015-12-18 21:48:06 -05:00
53ddc11f77
AI following
2015-12-18 20:36:11 -06:00
955dd0351c
Removes the sleep from the top of orbit, makes orbit check for var changes.
2015-12-18 18:02:32 -08:00
646eb1d924
Orbits now resets the atom's transform immediately
...
This can be done because animation() will still continue client side, regardless of what exists server side.
2015-12-18 17:48:12 -08:00
40212b6312
Fixes double tailed lizards
...
Depriciates *stopwag. *wag is now a toggle
2015-12-18 20:27:15 -05:00
39237fbcca
readds PR #12717 (Clear orbit on exit)
2015-12-18 16:59:25 -08:00
a7ccd084e8
Merge pull request #13734 from KorPhaeron/reinforcements
...
Allows nuke ops to purchase reinforcements
2015-12-18 21:47:01 -03:00
92240a9d95
Fixes invisible mask exploits
...
This code is awful and full of copy-paste and I can't be assed/can't
manage to figure out how to fix it properly so I just got the hammer and
made it always update everything whenever you toggle a helmet. Exploit's
dead at least.
Fixes #13486
2015-12-18 21:40:23 -03:00
b1f6225de9
Merge pull request #13749 from Anonus/furtherblobtweaks
...
Blobbernaut chem attacks 2, return of the chem attack
2015-12-18 21:33:10 -03:00
20daeabf9e
Proper refunds
2015-12-18 18:26:44 -06:00
c3195d19d4
Refunds
2015-12-18 18:10:26 -06:00
dd547f8b7a
Merge pull request #13643 from CPTANT/Robocop
...
changes robocop law priority
2015-12-18 17:48:21 -06:00
86a983d361
OOP
2015-12-18 17:42:49 -06:00
14916b0cf9
Merge pull request #13629 from MMMiracles/1handed
...
L6 SAW changes
2015-12-18 20:29:16 -03:00
7fc726c00a
Changes bloodcrawl define location
2015-12-18 17:51:10 -05:00
fe066f39b4
Merge pull request #13744 from hornygranny/proccalllogging
...
admin messages for proc calls
2015-12-18 16:03:35 -06:00
ef2ac1b0c8
CONflicts
2015-12-18 16:34:06 -05:00
b9ebbb6ed6
Merge pull request #13729 from KorPhaeron/admin_items
...
Grey Tide + Tesla Armor
2015-12-18 18:01:38 -03:00
673afecc8e
get_turf_pixel() is now more accurate:
...
* returns a turf closer to the center in even multiples of world.icon_size (64,128, etc.)
* Handles irregular (non-world.icon_size sized objects) better
* Now handles Matrix X/Y shifts
2015-12-18 20:41:26 +00:00
fe093d4e20
Fixes Travis failure
2015-12-18 15:27:29 -05:00
tkdrg
Cheridan
KorPhaeron
AndrewJacksonThe2nd
KorPhaeron
Jordie
Incoming
Kyle Spier-Swenson
Xhuis
MMMiracles
Remie Richards