DZD
8de0140dcc
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shadowling
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
code/setup.dm
2015-04-21 18:56:34 -04:00
Fox-McCloud
e8038738f6
Merge pull request #800 from ZomgPonies/shadow
...
Mutantrace update
2015-04-21 18:36:24 -04:00
ZomgPonies
8ce0212850
Final fixes
2015-04-21 18:05:43 -04:00
Fox-McCloud
dca6fac85f
Merge pull request #789 from Spacemanspark/master
...
Removes setting someone's mode to walk or run mode on aimmode.
2015-04-13 17:16:11 -04:00
ZomgPonies
1b4bfe1196
Removing all mutantrace crap except for slimepeople
2015-04-13 06:20:17 -04:00
ZomgPonies
55dbbc32b5
Might as well update golems also
2015-04-13 06:05:42 -04:00
ZomgPonies
1be205df11
Shadowpeople update
2015-04-13 01:06:39 -04:00
DZD
00035a51f0
It compiles!
...
- Makes shadowlings compile, require snowflaking of a few things to the
human Life() proc due to how Bay species works.
- Renames monkeyizing var to notransform, as that's effectively what it
was used for, to prevent transformation. (/tg/ port)
2015-04-12 19:54:45 -04:00
Tigercat2000
29c59bd51b
Add check for antags in msg_admin_attack
...
This commit first adds a new helper proc labeled isAntag(), as well as
adding a check for antags for every instance of msg_admin_attack().
Goals of this commit:
- Make admin ATTACK: logs indicate if attacker is an antagonist.
Note; High probability of merge conflicts, 47 files changed.
2015-04-12 08:41:53 -07:00
Spacemanspark
bb8dadb56b
Squishing commits
2015-04-11 14:46:15 -05:00
Fox-McCloud
dec621eefd
Revert "R&D Research Levels Unification"
2015-04-07 01:16:19 -04:00
ZomgPonies
4e9daf6aa8
Merge pull request #746 from jack-fractal/write-research-debug
...
R&D Research Levels Unification
2015-04-06 23:28:27 -04:00
jack-fractal
a0be969870
Unifying tech levels
...
Unifies tech levels between design and their products.
2015-04-06 22:07:44 -04:00
Fox-McCloud
7c739e4745
Merge pull request #710 from ZomgPonies/limb
...
Port of the BS12 limb overhaul
2015-04-05 19:06:39 -04:00
ZomgPonies
91e8b909c0
Squish Squash
2015-04-04 14:27:53 -04:00
Fox-McCloud
0efdc07191
[Goonchem] Few Recipes Tweaks
2015-04-03 01:25:42 -04:00
Fox-McCloud
796dbf233a
[Goonchem] Tweaks, Fixes, etc.
2015-03-28 21:16:13 -04:00
Fox-McCloud
d1932c0f64
[Goonchem] Transition to Goonchem
2015-03-27 05:41:45 -04:00
Fox-McCloud
56d6d7c9c8
Fixes
2015-03-26 10:27:04 -04:00
Mark van Alphen
69fb729dc1
Merge pull request #626 from Fox-McCloud/Guns-Fixes
...
Teleporter Gun, Fixes, and Tweaks
2015-03-23 15:38:44 +01:00
Fox-McCloud
cedb71e8af
Clarity
2015-03-22 20:18:01 -04:00
Fox-McCloud
d9a257c890
Teleporter Gun, Fixes, and Tweaks
2015-03-22 02:45:02 -04:00
Fox-McCloud
094b6e506e
Dragon's Breath Fix
2015-03-20 15:33:27 -04:00
Markolie
1cb3e38b65
Update saw-off code
2015-03-16 19:36:40 +01:00
Markolie
cacc2bf917
Fixes
2015-03-16 18:49:47 +01:00
SamCroswell
62ae69c816
Ninja File Structure Rework
...
Restructures the ninja files into a more spaced-out version, compliments
of /TG/. The energy katana is also their handiwork.
Add an emag act to crates and lockers instead of handling everything in
attackby.
2015-03-13 20:42:54 -04:00
SamCroswell
addfbe449e
Adds Shuriken
2015-03-09 21:28:28 -04:00
Fox-McCloud
253563e211
Energy Tweaks
2015-03-03 16:00:07 -05:00
Fox-McCloud
c1a1f851cf
Cyborg Rebalance
2015-03-02 22:54:09 -05:00
Markolie
607ebed0f0
Further turret fixes
2015-03-01 02:53:01 +01:00
Markolie
b28f791f8f
(Porta) turret update, map area update
2015-03-01 02:10:32 +01:00
Markolie
20ac07de8d
Bug fixes
2015-02-27 17:51:57 +01:00
Fox-McCloud
9850e6deb2
Laser Additions and Taser Nerf
2015-02-25 23:34:42 -05:00
ZomgPonies
5421754760
Merge pull request #418 from Fox-McCloud/Fixes-Genetics
...
Fixes, Genetics, and Balance
2015-02-25 21:56:33 -05:00
Fox-McCloud
85d79677b1
Fixes, Genetics, and Balance
2015-02-24 22:58:05 -05:00
SamCroswell
cd7b1a4075
ERT Rework - Part One
2015-02-24 09:47:44 -05:00
Fox-McCloud
6fba118892
Merge remote-tracking branch 'upstream/master' into Fixes
2015-02-23 16:47:55 -05:00
Fox-McCloud
96a941ba19
Fixes and Guns
2015-02-22 16:32:35 -05:00
Markolie
672305e034
Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things
2015-02-22 22:12:11 +01:00
Markolie
72db213067
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
code/game/jobs/job/support.dm
code/setup.dm
2015-02-22 19:12:11 +01:00
Markolie
982102a407
Standardize mutations
2015-02-22 19:04:43 +01:00
Markolie
3b072b5a62
Remove click delay from most things
2015-02-22 18:47:58 +01:00
ZomgPonies
1f5ef8d4dd
Merge pull request #380 from Markolie/master
...
Adds celsius to the freezer/heater, crafting update
2015-02-22 08:30:11 -05:00
ZomgPonies
1c1ebc3f3f
Merge pull request #383 from Fox-McCloud/Syndi-Hardsuits
...
Syndi hardsuits
2015-02-22 08:27:38 -05:00
Markolie
efb45ea228
Table crafting refactor
2015-02-22 01:50:57 +01:00
Fox-McCloud
edde2d10c6
Dart and Syringegun
2015-02-21 09:54:02 -05:00
Fox-McCloud
99d92aea35
Buckshot
2015-02-20 04:46:53 -05:00
Fox-McCloud
be2e754706
Syndicate Rebalance
2015-02-20 03:14:12 -05:00
DZD
b3a0c9a975
Removes TABLEPASS and FPRINT flags
...
- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
2015-02-10 17:41:37 -05:00
Markolie
354e569f9d
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
code/game/machinery/rechargestation.dm
2015-02-09 16:15:00 +01:00
