0bfe2a191b
removes leftovers
2015-06-29 19:02:51 +02:00
ef9712be12
Polling instead of persistent.
2015-06-28 15:23:43 +02:00
cad9b44264
Removes redundancy
2015-06-28 14:34:48 +02:00
20576bb71f
Adds blob toxin to examine
2015-06-28 14:34:48 +02:00
856edee625
WHOOPS
2015-06-23 12:57:28 -07:00
a8ec1c76df
Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
...
Conflicts:
code/ATMOSPHERICS/atmospherics.dm
code/game/machinery/computer/computer.dm
code/game/objects/items/weapons/explosives.dm
code/game/objects/structures/crates_lockers/closets/fireaxe.dm
code/game/objects/structures/musician.dm
code/game/objects/structures/tables_racks.dm
code/game/objects/structures/window.dm
2015-06-23 12:54:26 -07:00
62e635484a
Merge pull request #10069 from Ikarrus/gangrecruitnerf
...
Gang Update: Recruitment Edition
2015-06-23 14:33:13 -05:00
e3fa954daa
Merge pull request #10025 from phil235/WindowBugFix
...
Two window/windoor bugfixes
2015-06-23 12:23:32 -05:00
67ec200bc7
Few More Changes
2015-06-23 09:12:56 -06:00
f1fbfd93e6
Merge pull request #10029 from RemieRichards/ArmourPenetration
...
Armour Penetration and Armour Damage Reduction nerf
2015-06-22 23:49:18 -05:00
3b326a973b
Additional Changes
2015-06-22 22:29:51 -06:00
957f987b5d
Merge branch 'master' of https://github.com/tgstation/-tg-station into dragnet
...
Conflicts:
icons/effects/effects.dmi
icons/obj/items.dmi
2015-06-22 22:57:53 -05:00
f5f833ecbb
Merge pull request #9971 from KorPhaeron/newfloors
...
New Bluespace/Sepia slime reactions, new var for turfs
2015-06-23 03:43:28 +01:00
95b2cc2b09
Merge pull request #10092 from TheVekter/dangerwillrobinson
...
Danger Update: Meteors, Rods, Flux and Grav
2015-06-23 03:39:41 +01:00
ab4a0ade28
fixed the changelog FOR REAL THIS TIME, also fixed bad coding
2015-06-22 21:30:50 -05:00
3f57259c69
Merge pull request #9466 from Fayrik/TheNanoing
...
The Nanoing (Episode 2: The Fix Wars)
2015-06-22 14:24:20 +02:00
6b5676bd7f
Tweaked the meteor screen shake a bit, grav anoms now throw shit, and rods don't gib anymore.
2015-06-22 01:19:12 -05:00
79d2358303
Merge pull request #10067 from Boggart/constructionpermitfix
...
Fixes construction permits dissapearing even when usage fails
2015-06-21 23:41:16 -05:00
1f147b662e
Merge pull request #9832 from Iamgoofball/patch-73
...
Adds trekchems to the Medibots.
2015-06-22 03:06:31 +03:00
b4498de02a
Update Sleeper.dm
2015-06-21 17:00:49 -07:00
2d75f111c5
Adds trekchems to the Sleepers.
2015-06-21 16:59:23 -07:00
e6b738734a
Merge pull request #8876 from xxalpha/fixfixfix
...
Cyber Implants + (Pt.2)
2015-06-21 22:12:17 +03:00
58301912e2
This was way too much work, so this had better work now.
2015-06-21 20:04:16 +01:00
75d444b836
Fixes Broken C4s
...
Trying to place a C4 on an object will currently move the object onto your tile, and produce a runtime. This was because the code was trying to drop the target rather than the C4.
2015-06-21 10:18:15 -06:00
8eba1d09bf
Gang Update: Recruitment Edition
2015-06-21 00:04:36 -06:00
81d753a9d4
Fixes construction permits dissapearing even when usage fails and fixes a small grammar error with blueprints.
2015-06-20 22:04:39 -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
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
b89602c972
Squashed commits
2015-06-19 18:45:46 -06: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
f15c81d527
Caps armour to 90% damage reduction, bai bai invincibility, Adds armour_penetration variable to /item, counted for melee weapon and gun combat, Xenomorphs also have 10 armour_penetration per attack.
2015-06-18 20:36:36 +01:00
86d0a50776
Revert dump_act and dump_from_storage
2015-06-18 21:21:41 +02:00
AnturK
AnturK
Iamgoofball
Cheridan
Ikarrus
Cheridan
Remie Richards
TheVekter
phil235
Razharas
Fayrik
Boggart
GunHog
Swag McYolosteinen
Jordie0608
Xhuis
oranges
LaharlMontogmmery