Commit Graph

9304 Commits

Author SHA1 Message Date
Krausus
5567c99a44 Adds drag-drop emptying to all containers
Also, fixes several missing checks and a facing mistake.
2015-05-09 02:25:38 -04:00
ZomgPonies
1029e9afe1 Ports VG's DeityLink's new explosion method 2015-05-09 01:56:25 -04:00
Fox-McCloud
a02f560711 [Goonchem] Cryox/Clonex Change 2015-05-08 18:32:00 -04:00
ZomgPonies
3ff6339f04 Merge pull request #968 from Fox-McCloud/blobfix
Fixes Blob Zombies
2015-05-08 18:08:59 -04:00
TheDZD
6515b10ccc Merge pull request #963 from ZomgPonies/superhero2
Superhero Overhaul Part 2: Magnetic Boogaloo
2015-05-08 16:55:59 -04:00
ZomgPonies
6b6ff9b10f Merge pull request #972 from SirBloodBuske/master
Intercom Frame Icon fix
2015-05-08 15:04:40 -04:00
SirBloodBuske
a764cfdada Intercom Frame Icon fix 2015-05-08 05:49:22 -07:00
Krausus
d8e6893e35 Improves dumping of "quick" containers
Allows all "quick" containers to be dumped into a disposal (click) or
onto a table (drag-drop).
2015-05-08 07:20:44 -04:00
Fox-McCloud
b20104b360 Various Fixes and Tweaks 2015-05-07 23:31:39 -04:00
ZomgPonies
d3a8caddbf Makes Owlman's belt reload every 60 seconds 2015-05-07 18:04:12 -04:00
Fox-McCloud
a8ead35ea5 Fixes Blob Zombies 2015-05-07 17:35:43 -04:00
Tigercat2000
5f26969364 Merge remote-tracking branch 'upstream/master' into ContextBasedGrab
Conflicts:
	code/modules/mob/mob_grab.dm
2015-05-07 06:02:19 -07:00
ZomgPonies
a75f608398 Should only spawn one of each hero 2015-05-07 00:09:04 -04:00
Fox-McCloud
828e3c9927 Merge pull request #952 from ZomgPonies/superhero
Massive Superhero Update
2015-05-06 23:40:08 -04:00
ZomgPonies
31fc0d39a5 Final touches on superheroes 2015-05-06 23:26:33 -04:00
ZomgPonies
cd17fa4fb4 Refactor and clean up code 2015-05-06 19:14:22 -04:00
Fox-McCloud
e004610827 Merge pull request #956 from TheDZD/shadowling
Shadowling Fixes
2015-05-06 18:18:28 -04:00
TheDZD
b18294a570 Merge pull request #951 from Fox-McCloud/bag-stack
Enables Bag Item Stacking
2015-05-06 17:25:39 -04:00
ZomgPonies
a02bb8a1ae Fix up show antagonist to list heroes and villains 2015-05-06 03:07:46 -04:00
DZD
a769b4fc39 Shadowling fixes
- Fixes shadowling thralls not showing up on Check Antagonists.
- Also adds vampire thralls to Check Antagonists
- Fixes shadowlings not turning off hardsuit helmet lights.
- Fixes transforming into a shadowling dropping organs.
- Adds job such as blueshield, NT rep, and pod pilot to the list of jobs
that cannot be shadowlings.
- Remove ascended shadowling commune, transfers the shadowling's
languages to the ascendant instead.
- Fixes intercept not being sent to the station on shadowling rounds.
2015-05-05 21:44:44 -04:00
ZomgPonies
f096244ab2 Merge pull request #953 from veganzombeh/antaghud
Prevents ghosts with AntagHUD joining an ERT
2015-05-05 21:26:03 -04:00
ZomgPonies
054cb6e843 Microfix 2015-05-05 20:57:24 -04:00
ZomgPonies
43981fb34e Added lightning spell to wizards 2015-05-05 20:54:57 -04:00
ZomgPonies
3503c285fa Add toolbelt with smokebombs and bolas to owlman 2015-05-05 20:48:27 -04:00
veganzombeh
76ce46b93e Prevents ghosts with AntagHUD joining an ERT 2015-05-05 23:15:17 +01:00
Fox-McCloud
cbb2b819fd Enables Bag Item Stacking 2015-05-05 17:29:03 -04:00
ZomgPonies
ee7e560919 Superhero Update 2015-05-05 17:13:16 -04:00
Fox-McCloud
4edc23cd11 Ambience Runtime Fix 2015-05-05 16:44:08 -04:00
ZomgPonies
d106462fa5 Merge pull request #796 from TheDZD/shadowling
Port of /tg/station's Shadowlings [WIP]
2015-05-04 20:38:20 -04:00
DZD
ccfa32e4c5 Gamemode tweaks
Reverts required_players and number of shadowlings back to their
original values, as they were changed for testing.
2015-05-04 19:28:12 -04:00
Krausus
25a8d35ab0 Fixes magnetic gripper never afterattack-ing
This fixes magnetic grippers not being able to mount frames. Also, this
includes an exception for magnetic grippers in the wall code, to prevent
superfluous wall pushes.
2015-05-04 03:49:02 -04:00
ZomgPonies
1fe9bf4a43 Merge pull request #928 from FreeStylaLT/notparadise2
Engineering/Atmos beret changes
2015-05-03 18:48:01 -04:00
DZD
7e99d67587 Fixes runtimes
YES YES!
2015-05-03 16:58:32 -04:00
Fox-McCloud
7e5b7f9297 Merge pull request #933 from tigercat2000/ventcrawlfixe
Ventcrawling fixes
2015-05-03 16:14:41 -04:00
Fox-McCloud
10422a855d Merge pull request #922 from SirBloodBuske/master
Intercom construction and Deconstruction.
2015-05-03 14:32:53 -04:00
Tigercat2000
b14f7a429f Ventcrawling fixes
d3athrow/vgstation13#4251
tgstation/-tg-station#9296

 - Fixes moving between pipeline datums not updating pipe vision
 - Fixes login() not updating pipe vision
 - Removes hardcoded limit of entering through unary machinery-- does
   nothing *now*
 - Can see pipes in darkness as fullbright
 - More sanity checks
2015-05-03 09:19:27 -07:00
Fox-McCloud
5aada8a9a3 Merge pull request #906 from Krausus/NicotineAddiction
Cigarette Fixes/Tweaks
2015-05-02 23:29:49 -04:00
Krausus
c000cb4c78 Doubles cigar(ette) capacity, tweaks base nicotine 2015-05-02 23:08:17 -04:00
Krausus
f6ad960f60 Allows synthetics to get reagents from cigarettes 2015-05-02 22:43:44 -04:00
SirBloodBuske
d47a39a05a Fixing Intercom changes from VG Code to Paradise 2015-05-02 16:14:36 -07:00
FreeStylaLT
c290b1471e Engineering berets changes
Adds in a REAL Engineering beret, renames the current one to "atmospherics
beret", they spawn in engineering and CE's lockers.
2015-05-03 01:41:42 +03:00
SirBloodBuske
b63d1d0163 Adding Intercom to recipes 2015-05-02 15:12:42 -07:00
Fox-McCloud
cd311ba414 Merge pull request #915 from veganzombeh/fix
Various fixes
2015-05-02 17:00:40 -04:00
SirBloodBuske
92789ec855 Revert "Revert "Intercom build/destroy""
This reverts commit 26ae8ac80e.
2015-05-02 00:19:34 -07:00
SirBloodBuske
26ae8ac80e Revert "Intercom build/destroy"
This reverts commit 3a2b2e906d.
2015-05-02 00:19:27 -07:00
SirBloodBuske
3a2b2e906d Intercom build/destroy 2015-05-02 00:19:14 -07:00
Krausus
21b92a80f9 Tweaks cigarette reagent depletion message 2015-05-01 22:46:53 -04:00
Tigercat2000
e598a4e40a Merge remote-tracking branch 'upstream/master' into ContextBasedGrab 2015-05-01 18:18:08 -07:00
veganzombeh
79c084450a Various fixes 2015-05-01 17:54:30 +01:00
Tigercat2000
26f1cd88d5 ONE DAY I WILL HAVE FIXED TOXINS MIXING
I left out a very important define from plasma windows that prevents them
from heating the room
2015-05-01 07:52:29 -07:00