Remie Richards
c79963f7b7
Merge pull request #9792 from GunHog/AI_STOLE_MY_BIKE
...
Malf AI module changes + Mechs for normal AIs!
2015-06-21 00:30:03 +01:00
Remie Richards
ee1e30717a
Merge pull request #9980 from LaharlMontogmmery/ContentTransfer
...
Container Content Transfer - Good for Review (Again...Again.)
2015-06-21 00:09:19 +01:00
Cheridan
05f65f04b8
Merge pull request #9866 from Xhuis/revenants
...
Revenant Rework (NOW WITH LESS CLOSING)
2015-06-20 13:24:02 -05:00
Swag McYolosteinen
859c5e66e0
Merge pull request #9930 from duncathan/givinunarysomelovin
...
Brings some unary devices closer to the present
2015-06-20 20:14:02 +02:00
Swag McYolosteinen
7929b7dcd7
Merge pull request #10031 from Ikarrus/gangfashion
...
Gang Update: Fashion War Edition
2015-06-20 18:06:19 +02:00
Cheridan
a2948ba203
Merge pull request #9956 from Jordie0608/whocodesthecodemen
...
Various admin improvements
2015-06-20 00:53:30 -05:00
Cheridan
a45804dcfe
Merge pull request #10033 from optimumtact/reeeeeeee_hitby_messages
...
Hitby messages removed, may help with singularity lag from throwing
2015-06-20 00:19:03 -05:00
Cheridan
f5525749ce
Merge pull request #10027 from phil235/StraightJacketBuckleResistFix
...
Fixes being able to unbuckle yourself while straightjacketed
2015-06-20 00:07:56 -05:00
Cheridan
08f46d5652
Merge pull request #10016 from Ikarrus/iambulletproof
...
Buffs bulletproof vests back to 80
2015-06-19 18:49:02 -05:00
Xhuis
2823a98244
Merge remote-tracking branch 'remotes/upstream/master' into thaw
2015-06-19 11:23:45 -04:00
Swag McYolosteinen
e4281bbaab
Merge pull request #10019 from Thunder12345/autoshotgun
...
Moved combat shotguns to shotgun/automatic/combat
2015-06-19 17:06:00 +02:00
Swag McYolosteinen
1dde070d18
Merge pull request #9800 from Dorsisdwarf/wittybranchname
...
Buffs nuke ops [merge ready]
2015-06-19 12:00:23 +02:00
Ikarrus
e27cdc7efe
Resolved Conflicts:
...
code/game/gamemodes/gang/dominator.dm
2015-06-18 23:05:51 -06:00
Ikarrus
2605ed586b
Reverts dominator sound change
...
Dominator sets Delta Alert now
Delta Alert text changed to accommodate this change (+3 squashed commit)
Squashed commit:
[3129c95] Icon state update
[21bddf3] Dominators play the malf sound when activated (until I can find a better alternative).
[2289074] Unfucks changelog (+1 squashed commits)
Squashed commits:
[2289074] Unfucks changelog
2015-06-18 23:00:04 -06:00
Xhuis
e1356f889e
Merge remote-tracking branch 'remotes/upstream/master' into thaw
2015-06-18 23:37:06 -04:00
oranges
ea1df76a6d
Hitby messages removed, may help with singularity lag from throwing
2015-06-19 15:32:56 +12:00
Ikarrus
46a5e578e4
Gang Update: Fashion War Edition
...
This update primarily deals with gang outfits and expands on how they affect the round.
2015-06-18 20:01:57 -06:00
LaharlMontogmmery
86d0a50776
Revert dump_act and dump_from_storage
2015-06-18 21:21:41 +02:00
Xhuis
ad3f81f88d
Custom spawn points and reforming ectoplasm
2015-06-18 13:18:53 -04:00
Thunder12345
1c83cc6d45
Pray pray pray
2015-06-18 18:07:57 +01:00
LaharlMontogmmery
38ab424b8b
More OOP! Also preparing the bases for another future PR.
2015-06-18 18:59:04 +02:00
phil235
172ee5ec67
Fixes being able to unbuckle yourself while straightjacketed
2015-06-18 18:41:22 +02:00
Xhuis
bfb66ed518
Some more changes
2015-06-18 12:19:13 -04:00
Cheridan
470f21a752
Merge pull request #10004 from Ikarrus/gangimplants
...
Gang Update: Loyalty Implant Edition
2015-06-18 10:41:15 -05:00
LaharlMontogmmery
373c918a4a
Going through some hOOPs - bit of a overhaul.
2015-06-18 17:40:35 +02:00
phil235
e6dcabf245
Merge pull request #9960 from xxalpha/bass
...
Put drop_item() calls inside ifs. Replaced some drop_item() with unEq…
2015-06-18 15:50:35 +02:00
Xhuis
08d273e9bd
Removes some coffee stains
2015-06-18 00:07:32 -04:00
Xhuis
984ad17613
Merge remote-tracking branch 'remotes/upstream/master' into fuggingRevenants
2015-06-18 00:05:45 -04:00
Xhuis
dd2e262344
A bit more work
2015-06-18 00:02:16 -04:00
Ikarrus
fe14ff46ee
- Reduced uzi ammo to 25 influence cost
...
- Added uzis to summon guns
- uncapitalized uzi names
2015-06-17 19:26:02 -06:00
xxalpha
ab103b54dc
Righted some checks.
...
If newcolor
2015-06-17 21:03:11 +01:00
Razharas
f4cf6ffc95
Merge pull request #9978 from phil235/XrayGunNerf
...
Nerfs xray gun
2015-06-17 22:13:53 +03:00
phil235
3b93604fa5
Merge pull request #9791 from AnturK/hallucinations
...
New hallucinations
2015-06-17 20:50:20 +02:00
phil235
98c158f958
Merge pull request #9845 from AnturK/buttsender
...
Adds PDA-Message Photo Attachment
2015-06-17 20:36:52 +02:00
Thunder12345
608486a919
Typo fix
2015-06-17 18:55:05 +01:00
Cheridan
ee87a1dc23
Merge pull request #9974 from phil235/MirrorRaceChangeFix
...
Mirror race change fix
2015-06-17 12:54:19 -05:00
AnturK
1e55c8ac1a
Minor fixes
2015-06-17 18:59:28 +02:00
phil235
afe0a10bb2
Merge pull request #9989 from optimumtact/patch-3
...
PSHOOM
2015-06-17 18:01:11 +02:00
Ikarrus
556b25aec3
Added 9mm 2-burst 32 mag uzis that costs 40 influence. Unlike tommy guns gangs will be able to purchase ammo for uzis.
2015-06-17 09:36:15 -06:00
Thunder12345
275bde00ef
Changed description slightly
2015-06-17 15:49:56 +01:00
Thunder12345
bfb2345726
Moved combat shotguns to shotgun/automatic/combat
...
- shotgun/automatic/ will pump itself automatically on firing
- combat shotgun capacity nerfed to 6 rounds
- replaced all instances of the old path with the new one
2015-06-17 15:25:59 +01:00
phil235
f976ae8a58
Merge pull request #9957 from MrStonedOne/boomboomshaketheroom
...
Makes the bomb cap a config option.
2015-06-17 14:17:09 +02:00
Remie Richards
8820662c31
Merge pull request #9847 from Xhuis/ALL_HAIL_LORD_SINGULOTH
...
ALL HAIL GOD-EMPEROR SINGULOTH
2015-06-17 10:47:35 +01:00
Ikarrus
f9d28fbe00
Buffs bulletproof vests back to 80
2015-06-16 19:44:20 -06:00
Cheridan
6b6ffe0314
Merge pull request #9972 from Dorsisdwarf/sudoku
...
Adds a suicide_act to pens
2015-06-16 13:39:37 -05:00
phil235
c177f99d63
Xray gun nerf is just the 15 tiles range.
2015-06-16 19:49:25 +02:00
phil235
56cd6d7140
Changes xray beam to have reduced damage instead of reduced range when hitting something.
2015-06-16 18:35:20 +02:00
Xhuis
3bc466a0ff
Merge remote-tracking branch 'remotes/upstream/master' into thaw
2015-06-16 11:42:47 -04:00
Jordie
26d75cc5ba
Merge pull request #9863 from MrPerson/508_compilation
...
Makes the game compile in byond version 508
2015-06-16 19:38:11 +10:00
phil235
9a1c1ae7af
Merge pull request #9967 from Jordie0608/figurediwouldvemissedsome
...
Fixes computer icon errors
2015-06-16 11:30:44 +02:00
