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
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
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
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
ee87a1dc23
Merge pull request #9974 from phil235/MirrorRaceChangeFix
...
Mirror race change fix
2015-06-17 12:54:19 -05:00
3bc466a0ff
Merge remote-tracking branch 'remotes/upstream/master' into thaw
2015-06-16 11:42:47 -04: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
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
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
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
565e4dda5a
Merge pull request #9931 from Jordie0608/tfwyougetsocarriedawayyoudontevenachievewhatyousetoutforandhavetomakeasecondprforit
...
Overlays for computers
2015-06-14 10:25:27 -05: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
9d64ca0e0c
makes the game compile
...
fixes more icon paths
I gave zvent the vent_map icon as a placeholder because it's not like it's even used anyway
2015-06-13 12:33:31 -06:00
752f5e883d
eol conversion
2015-06-13 20:15:49 +10:00
5ef93b2225
overlays for computers
2015-06-13 20:07:48 +10: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
899f2f5119
Security locker unlocks if you attack it with an empty hand.
2015-06-13 11:20:33 +03: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
7dbd3b13da
Merge pull request #9872 from xxalpha/itsalwaystrue
...
Fixes infinite cyborg stack usage on a couple of things.
2015-06-13 04:34:05 +03:00
4373f6eece
Merge pull request #9904 from xxalpha/runtimesrun
...
Fixes three runtimes.
2015-06-13 04:29:20 +03:00
595bb0c8e4
Generalizes lizard parts to "features" for future non-lizard fields, at the same time merging mutant color into this list
...
Random lizard bodies will finally have color!
Pushes features almost all the way to the DNA side of thing, the mob side is only needed during character creation.
Note that changes to the save file will invoke a one time per character runtime for legacy characters as the save file purges mutant_color, this is as far as I can tell harmless, has no effect on the player, and is self correcting.
2015-06-12 00:43:35 -04:00
9ba7e6aaf4
Fixes three runtimes.
...
Better fix. src. purge
2015-06-11 21:30:13 +01:00
7afd81e083
removes loaded bag from locker, adds to uplink at discounted price. Lowers cost of least-used ammo type
2015-06-11 08:09:36 +01:00
50e49d1136
FEATURES SIX AND SEVEN: Suicide msg's and cloaks
2015-06-10 14:17:38 -04:00
1f0097a74a
Adds the bind soul spell for wizards. It turns them into a lich (skeleton) and gives them access to a long cooldown ressurection spell (starts at 3 minutes).
...
The ressurection spell can only be used while dead/dying and charges at all times. When used the lich gains a new body at the site of their phylactery and is stunned for a short while. Meanwhile the old wizard body crumbles to dust leaving all the wizards worldly possessions on the ground. Anyone who sees the corpse crumble will also get a cardinal direction pointing towards the wizard.
Every time the wizard dies this way, the time between ressurections is increased by a minute. To take a lich out of the game for good, either destroy the body before the lich can cast the spell again, or destory the phylactery and kill the wizard one last time.
Liches spawn with robes and spells intact, but nothing else, everything collected on their original body stays there.
As a balance issue, this spell can't be used in the den, the item must be bound after arriving at the station.
Adds a nice black wizard robe ensemble for liches.
Magic mirrors (save for a special badmin only one) can no longer skeletonize people.
Adds a hopeful mulligan fix to wizard rounds problems. Also corrects an adminlog message.
2015-06-10 03:40:14 -04:00
ed6b1d137c
Fixes infinite cyborg stack usage on a couple of things.
...
Kill debug msg
Better fix.
Finished better fix.
NOW FINISHED
2015-06-10 03:27:04 +01:00
f81da3f13d
Merge pull request #9818 from phil235/TypoJanicartFix
...
Fixes typo in janitorial cart message.
2015-06-07 16:50:56 -05:00
0e28326097
Merge pull request #9779 from Cheridan/touching_linda
...
Pressure_resistance Tweaks
2015-06-07 04:57:52 +03:00
24463314f9
Fixes typo in janitorial cart message.
2015-06-06 13:30:20 +02:00
ccd4137a9d
Merge pull request #8974 from kingofkosmos/mopbucket
...
Mopping with just a bucket
2015-06-06 13:18:07 +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
Remie Richards