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
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
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
91f05d1a21
Fixes windoor not being damaged by fires. Fixes not being to attack windows with a welder on harm intent.
2015-06-18 14:57:24 +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
58b436fe1f
adds abandoned crates to code, adds crate spawners to code, distributes crate spawners across maps
2015-06-17 09:07:28 -05: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
fd27d9d3bb
Merge remote-tracking branch 'remotes/upstream/master' into AI_STOLE_MY_BIKE
...
Conflicts:
code/game/gamemodes/malfunction/Malf_Modules.dm
2015-06-15 12:26:28 -05:00
0b611acd7b
Compile fix
...
Fixes the things after resolving merge conflicts.
2015-06-15 12:15:29 -05:00
bc11259282
Merge remote-tracking branch 'remotes/upstream/master' into AI_STOLE_MY_BIKE
...
Conflicts:
code/game/machinery/computer/aifixer.dm
2015-06-15 11:27:11 -05:00
ae8c69f9a7
Merge pull request #9955 from kingofkosmos/spanspaceremoval
...
Unnecessary space removal from spans and messages
2015-06-15 18:20:04 +02:00
d275152a96
Fixes the wizard magic mirror race change.
...
Fixes the "race swap" wizard event.
2015-06-15 17:01:07 +02:00
8fc003029c
Merge branch 'master' of https://github.com/tgstation/-tg-station into ironicthatonehumanisasectorzerolaw
...
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
2015-06-15 16:34:56 +10:00
2e7ddc1f45
Merge pull request #9053 from MrPerson/screen_alert_2
...
More screen alerts
2015-06-15 01:00:20 +02:00
a00e11520c
Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
2015-06-14 15:42:15 -07:00
ec8cd61d4c
Merge pull request #9808 from Incoming5643/march_of_the_snowflakes
...
WJohn's Hyper Customizable Lizard Sprites
2015-06-14 17:40:20 -05:00
5e425cad89
Merge pull request #9945 from phil235/ExplosionThrowAnchorFix
...
Explosions no longer throw anchored items.
2015-06-14 17:26:10 -05:00
e9419764f7
Merge pull request #9929 from kingofkosmos/seclockerfix
...
Locker unlocks if you attack it with an empty hand
2015-06-14 17:12:44 -05:00
b2e84a0d3c
Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(
2015-06-14 20:11:40 +01:00
Cheridan
Xhuis
Swag McYolosteinen
Ikarrus
oranges
Remie Richards
LaharlMontogmmery
Thunder12345
phil235
phil235
pudl
Jordie
Cheridan
GunHog
Iamgoofball
xxalpha