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
3f57259c69
Merge pull request #9466 from Fayrik/TheNanoing
...
The Nanoing (Episode 2: The Fix Wars)
2015-06-22 14:24:20 +02: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
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
a2948ba203
Merge pull request #9956 from Jordie0608/whocodesthecodemen
...
Various admin improvements
2015-06-20 00:53:30 -05:00
2823a98244
Merge remote-tracking branch 'remotes/upstream/master' into thaw
2015-06-19 11:23:45 -04: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
e1356f889e
Merge remote-tracking branch 'remotes/upstream/master' into thaw
2015-06-18 23:37:06 -04: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
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
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
e52486cf8e
Merge pull request #9933 from xxalpha/rapiddeconstructiondevice
...
Fixes RCD wall deconstruction runtime.
2015-06-17 17:13:39 +02: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
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
ae8c69f9a7
Merge pull request #9955 from kingofkosmos/spanspaceremoval
...
Unnecessary space removal from spans and messages
2015-06-15 18:20:04 +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
b2e84a0d3c
Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(
2015-06-14 20:11:40 +01:00
a67de221cc
JMP replaced with FLW, fixes and adds a bunch of key_name checks in adminlogging
2015-06-14 23:37:35 +10:00
c8d79e7034
Removed unnecessary spaces in these situations:
...
"span class = '" changed to "span class='"
"'> " changed to "'>"
2015-06-14 12:13:19 +03:00
e90b472800
Fixed RCD wall deconstruction runtime.
2015-06-13 13:17:02 +01:00
dab13732fe
cleans up icon paths; modifies certain unary devices
...
updates icon paths in multiple files
removed insulated icon state in pipe_item.dmi (insulateds are deaaaad)
lays an icon framework so that o2 generators, cold sinks, heat sinks may eventually be made constructable
they no longer override update_icon() but instead update like just about every other device
eventually I'll give these real sprites but given that they're unused it can wait for now
sprites and construction are outside the scope of this PR
makes heat exchangers update their color based on their node
because heat exchangers are different sprite-wise they had to override update_icon entirely
makes heat exchanger, heat sinks, cold sinks, o2 generators non-dense
2015-06-13 02:43:17 -06:00
b7150068cc
Merge pull request #9783 from nukeop/master
...
Adds a chemistry bag for moving large amounts of patches/pills/bottles at once
2015-06-13 04:42:16 +03:00
1800c56456
Merge pull request #9769 from Cheridan/ACTUAL_FUN_REMOVAL
...
Adjusts Chaplain Special Bible Equipment
2015-06-11 16:15:41 +01:00
50e49d1136
FEATURES SIX AND SEVEN: Suicide msg's and cloaks
2015-06-10 14:17:38 -04:00
7c3cb399d0
Makes the game compile in byond version 508
...
throw is a reserved keyword so all throw() and var/throw had to be renamed.
Only compile tested because I'm fucking lazy.
2015-06-09 04:14:12 -07:00
29c2bb474d
Merge pull request #9804 from Firecage/Exwelder
...
Adds the experimental welder to R&D + adds some descriptions.
2015-06-07 21:23:45 -05:00
ab4725f709
Makes the experimental welder only regen fuel while off.
2015-06-06 11:37:59 +02:00
89e2fbf0bb
Adds the experimental welder to R&D + adds some descriptions.
2015-06-05 20:43:21 +02:00
fc88bce4b6
sets default shotgun ammo to slugs, makes syndicate ammo bag actually have ammo in it
2015-06-05 14:05:32 +01:00
1443ee1c75
add icon for chemistry bag
...
add two chemistry bags to the chemistry closet
add an option to make a chemistry bag to the biogenerator for 200 points
2015-06-04 19:17:44 +01:00
8184d71a1e
add chemistry bag
2015-06-04 14:18:49 +01:00
6618ead426
Readds The Clown Mask
...
lame gimmick chaplains rejoice i guess
2015-06-03 00:32:25 -05:00
Cheridan
phil235
Ikarrus
Remie Richards
Swag McYolosteinen
Cheridan
Xhuis
LaharlMontogmmery
Jordie
xxalpha
kingofkosmos
duncathan
Razharas
MrPerson
Firecage
Dorsisdwarf
barackobama