6cab00e31b
Reverts BPRED change.
2015-06-24 19:51:28 +02:00
44b10eb779
Nerfs the BRPED range to 7.
2015-06-21 20:00:43 +02:00
ea9849a436
Reduce range of the BoH to 7.
2015-06-21 17:20:01 +02:00
b91e99507c
Base Changes for BlueSpace Content Transfer
2015-06-21 15:14:02 +02:00
5532a09764
Merge pull request #10066 from Boggart/adminpmdebugmessagequickfix
...
Removes a couple of debug messages from adminpm.
2015-06-21 12:00:08 +03:00
3da5cfd336
Merge pull request #10047 from Iamgoofball/patch-82
...
Removes Morphine Blob
2015-06-21 01:51:43 -05:00
ffbba1eb10
Removes a couple of debug messages from adminpm.
2015-06-20 21:30:14 -06:00
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
ee1e30717a
Merge pull request #9980 from LaharlMontogmmery/ContentTransfer
...
Container Content Transfer - Good for Review (Again...Again.)
2015-06-21 00:09:19 +01:00
0fadec6b60
Changes lockdown cost from 40 to 30
2015-06-20 13:33:01 -05:00
05f65f04b8
Merge pull request #9866 from Xhuis/revenants
...
Revenant Rework (NOW WITH LESS CLOSING)
2015-06-20 13:24:02 -05:00
859c5e66e0
Merge pull request #9930 from duncathan/givinunarysomelovin
...
Brings some unary devices closer to the present
2015-06-20 20:14:02 +02:00
7929b7dcd7
Merge pull request #10031 from Ikarrus/gangfashion
...
Gang Update: Fashion War Edition
2015-06-20 18:06:19 +02:00
77d6facca1
Pinpointer now resets after all dominators are destroyed.
2015-06-20 09:10:20 -06:00
538d4ad303
Merge branch 'master' of https://github.com/tgstation/-tg-station into glassisapaintosprite
...
Conflicts:
_maps/map_files/MiniStation/MiniStation.dmm
code/game/objects/structures/crates_lockers/closets/fireaxe.dm
2015-06-20 18:37:39 +10:00
a2948ba203
Merge pull request #9956 from Jordie0608/whocodesthecodemen
...
Various admin improvements
2015-06-20 00:53:30 -05:00
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
f5525749ce
Merge pull request #10027 from phil235/StraightJacketBuckleResistFix
...
Fixes being able to unbuckle yourself while straightjacketed
2015-06-20 00:07:56 -05:00
85975e3d53
Removes Morphine Blob
...
the last few times I tried to make this commit I fell asleep for 3 hours accidentally bumping the code
2015-06-19 22:06:19 -07:00
b89602c972
Squashed commits
2015-06-19 18:45:46 -06:00
08f46d5652
Merge pull request #10016 from Ikarrus/iambulletproof
...
Buffs bulletproof vests back to 80
2015-06-19 18:49:02 -05:00
0b8a35426b
Merge pull request #9789 from Xhuis/justBreakingTheIce
...
Xhuis' Summer Thaw Event [merge-ready]
2015-06-19 23:09:33 +02:00
bc7d1ab93d
Changes the way the airlock charge works
2015-06-19 14:46:06 -04:00
9c97ee19de
Merge pull request #9962 from phil235/MachineFrameDecoCrystalFix
...
Fixes machine frame not dropping all /obj/item upon deconstruction.
2015-06-19 13:44:04 -05:00
fa22849f8c
Merge pull request #10022 from Ikarrus/corgimeat
...
Removes Corgi Meat as a possible steal objective
2015-06-19 10:31:03 -05:00
2823a98244
Merge remote-tracking branch 'remotes/upstream/master' into thaw
2015-06-19 11:23:45 -04:00
e4281bbaab
Merge pull request #10019 from Thunder12345/autoshotgun
...
Moved combat shotguns to shotgun/automatic/combat
2015-06-19 17:06:00 +02:00
1dde070d18
Merge pull request #9800 from Dorsisdwarf/wittybranchname
...
Buffs nuke ops [merge ready]
2015-06-19 12:00:23 +02:00
e27cdc7efe
Resolved Conflicts:
...
code/game/gamemodes/gang/dominator.dm
2015-06-18 23:05:51 -06:00
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
e1356f889e
Merge remote-tracking branch 'remotes/upstream/master' into thaw
2015-06-18 23:37:06 -04:00
ea1df76a6d
Hitby messages removed, may help with singularity lag from throwing
2015-06-19 15:32:56 +12:00
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
86d0a50776
Revert dump_act and dump_from_storage
2015-06-18 21:21:41 +02:00
3eb11eb48f
Add extra rustling. Also adding mouse_over for lockers.
2015-06-18 19:55:15 +02:00
ad3f81f88d
Custom spawn points and reforming ectoplasm
2015-06-18 13:18:53 -04:00
1c83cc6d45
Pray pray pray
2015-06-18 18:07:57 +01:00
38ab424b8b
More OOP! Also preparing the bases for another future PR.
2015-06-18 18:59:04 +02:00
172ee5ec67
Fixes being able to unbuckle yourself while straightjacketed
2015-06-18 18:41:22 +02:00
bfb66ed518
Some more changes
2015-06-18 12:19:13 -04:00
470f21a752
Merge pull request #10004 from Ikarrus/gangimplants
...
Gang Update: Loyalty Implant Edition
2015-06-18 10:41:15 -05:00
373c918a4a
Going through some hOOPs - bit of a overhaul.
2015-06-18 17:40:35 +02:00
d20730783e
Merge pull request #9927 from Incoming5643/shadow_the_huaghaes
...
Adds some basic scaling, ~10% of crew, to shadowlings.
2015-06-18 10:15:40 -05:00
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
08d273e9bd
Removes some coffee stains
2015-06-18 00:07:32 -04:00
984ad17613
Merge remote-tracking branch 'remotes/upstream/master' into fuggingRevenants
2015-06-18 00:05:45 -04:00
dd2e262344
A bit more work
2015-06-18 00:02:16 -04:00
e255cd7663
Removes Corgi Meat as a possible steal objective
...
It's stupid and excessively silly.
2015-06-17 20:37:44 -06:00
fe14ff46ee
- Reduced uzi ammo to 25 influence cost
...
- Added uzis to summon guns
- uncapitalized uzi names
2015-06-17 19:26:02 -06:00
ab103b54dc
Righted some checks.
...
If newcolor
2015-06-17 21:03:11 +01:00
LaharlMontogmmery