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
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
e6b738734a
Merge pull request #8876 from xxalpha/fixfixfix
...
Cyber Implants + (Pt.2)
2015-06-21 22:12:17 +03: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
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
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
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
bc7d1ab93d
Changes the way the airlock charge works
2015-06-19 14:46:06 -04: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
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
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
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
98c158f958
Merge pull request #9845 from AnturK/buttsender
...
Adds PDA-Message Photo Attachment
2015-06-17 20:36:52 +02:00
dd25853085
Moved all the istype check to storage_contents_dump_act, and added children for that proc for lockboxes and safes/briefcases
2015-06-17 20:28:40 +02:00
ee87a1dc23
Merge pull request #9974 from phil235/MirrorRaceChangeFix
...
Mirror race change fix
2015-06-17 12:54:19 -05:00
e52486cf8e
Merge pull request #9933 from xxalpha/rapiddeconstructiondevice
...
Fixes RCD wall deconstruction runtime.
2015-06-17 17:13:39 +02:00
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
63aa008077
Merge pull request #9401 from Firecage/ofgibtonite
...
Adds a check to prevent a future ranged Gibtonite message + fixed the message
2015-06-17 15:12:10 +02:00
07c3de821e
The bag UI actually refreshes properly now.
2015-06-16 22:03:16 +02:00
0a9db72857
Put the content transfer code into a proc, for maintainability
2015-06-16 21:26:45 +02:00
c7029ff806
Merge pull request #9799 from kyrahabattoir/glassUtility
...
Mapping tool: adds a "structure" spawner that can be used to create "…
2015-06-16 13:25:00 -05:00
73af6fabb6
Check Adjacence + expanding the restraint/Stat check
2015-06-16 19:15:32 +02:00
3bc466a0ff
Merge remote-tracking branch 'remotes/upstream/master' into thaw
2015-06-16 11:42:47 -04:00
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
0bf6f09969
Merge branch 'master' of https://github.com/tgstation/-tg-station into whocodesthecodemen
...
Conflicts:
code/modules/admin/verbs/pray.dm
2015-06-16 17:24:20 +10:00
34fb8cc8bc
toggle nuke and set sec level button, flamethrower logging
2015-06-16 17:19:56 +10:00
7aba70ecf3
DRAGnet lives!
2015-06-15 23:55:28 -05:00
210cc17d5c
Loyalty Implants and Gang Mode
...
Security treating gangs like revs has had a very negative impact on the experience of gang rounds. With an easy and convenient deconversion method, gangs are easily stomped as they rapidly run out of members to convert. So I'm going to try something different and see how things go if implants in gang mode acted as they are in cult.
- Implants can still prevent conversion, but can no longer deconvert or identify gangsters
- If a recruitment pen fails, the error message the gang boss receives will distinct loyalty implanted individuals from enemy gangsters.
2015-06-15 21:39:21 -06:00
33497c75f6
Placed the code at the wrong place. Woops! Also fixed the bin check and the UI for the bags
2015-06-16 00:08:19 +02:00
4dd2887b74
Committing base Changes
2015-06-15 22:07:30 +02:00
Cheridan