8c62ccfe2e
Moves clothes from out of equipment lockers and into wardrobe closets
...
- Wardrobe closets are not locked, so it should make it a bit easier to steal disguises
- Unclutters equipment lockers
- Heads still have their one lockers for convenience, but some of the clothes have been removed if they're already in a department's wardrobe
2015-06-27 17:22:02 -06:00
856edee625
WHOOPS
2015-06-23 12:57:28 -07:00
a8ec1c76df
Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
...
Conflicts:
code/ATMOSPHERICS/atmospherics.dm
code/game/machinery/computer/computer.dm
code/game/objects/items/weapons/explosives.dm
code/game/objects/structures/crates_lockers/closets/fireaxe.dm
code/game/objects/structures/musician.dm
code/game/objects/structures/tables_racks.dm
code/game/objects/structures/window.dm
2015-06-23 12:54:26 -07:00
3b326a973b
Additional Changes
2015-06-22 22:29:51 -06: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
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
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
3bc466a0ff
Merge remote-tracking branch 'remotes/upstream/master' into thaw
2015-06-16 11:42:47 -04:00
ae8c69f9a7
Merge pull request #9955 from kingofkosmos/spanspaceremoval
...
Unnecessary space removal from spans and messages
2015-06-15 18:20:04 +02:00
a00e11520c
Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
2015-06-14 15:42:15 -07:00
b2e84a0d3c
Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(
2015-06-14 20:11:40 +01:00
c8d79e7034
Removed unnecessary spaces in these situations:
...
"span class = '" changed to "span class='"
"'> " changed to "'>"
2015-06-14 12:13:19 +03:00
4de75c539f
Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
...
Conflicts:
code/game/objects/structures/crates_lockers/closets.dm
code/game/objects/structures/table_frames.dm
code/game/objects/structures/windoor_assembly.dm
2015-06-13 14:20:17 -07:00
c2256d41fc
BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH
2015-06-13 13:58:08 -07: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
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
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
fd17e5fd57
Fixes a critical bug where clicking on a closed closet that can't be opened (welded most likely) would lead to an infinite loop of attacking attackby and attack_hand until the mob pulled away from the closet. Eating too many of these errors causes the server to cry for mercy and shut down. Meaning of course that EVERY PLAYER IN THE GAME WHO READS THIS PULL CAN NOW CRASH THE GAME AT THIER LEISURE.
...
So yeah merge quick please.
2015-05-20 23:00:28 -04:00
494403969e
Alt-click-toggles now do proper checks
...
Such as if you're near the thing, conscious, alive etc.
Fixes #9238
2015-05-18 20:22:04 +03:00
f3e91beba6
KEEP YOUR HOES IN LINE
2015-05-11 15:58:18 -05:00
489d076de5
Merge pull request #9126 from Jordie0608/doesrussellsteapotapplytorussellsteapot
...
Fixes #9035 , atmos locker sprite and misc logging bug
2015-05-08 16:24:21 +02:00
c9b804f6f6
Merge pull request #9256 from astralenigma/cradesbypaprka
...
Crates are mailed with manifests taped to the outside by paprka Merge Conflict resolution
2015-05-08 22:10:35 +10:00
95d7af4e48
Merge pull request #9277 from Ikarrus/ertbaton
...
Batons for Light ERP
2015-05-06 09:03:55 -05:00
78fdf5e1f7
I think I'm done but I'm always wrong
...
Removed secure/new() due to it's current uselessness
Put all changes in the secure overlays inside the update icon
Found a bug where EMP act would only unlock the crate instead of
breaking it but would still apply the emag overlay I defaulted the fix
to breaking the crate.
Moved the variables from emag act and emp act upwards for compliance
with the update_icon() checks.
2015-05-02 21:37:33 +01:00
b331391aa5
Batons for Light ERT
...
Moved the batons from the lockers to their backpacks so light ERTs can use them
2015-05-01 21:30:34 -06:00
fe8e7f3f65
Moved the overlays.cut() per request.
2015-05-02 02:12:17 +01:00
be1708483e
- Fixed nettle soup recipe says abstract nettle.
...
- Fixes hostile animals weakening non carbons, and adjusted weakening values 1958.
- fixes being able to drop defib paddle by resting, fix a runtime linked to this.
- can no longer pick card from deck while resting, same for paper bin and bedsheet bin.
- examining extinguisher and atmos watertank nozzle gives you the amount of water remaining.
2015-05-02 01:34:38 +02:00
8d72d9ef2b
Second attempt at overlay
...
None of the crates appear with the manifesto outside, but he's there
waiting lurking in the shadows waiting to strike.
2015-05-01 08:01:54 +01:00
30b86c060f
The manifest code is completed in the crate
...
just need to fix possible bugs that I find.
2015-05-01 02:57:39 +01:00
d84bfc0f2b
Putting all on github now.
...
Only crates is missing the overlay of the manifesto.
2015-05-01 00:33:21 +01:00
a6b3deda96
Merge branch 'master' of https://github.com/tgstation/-tg-station into doesrussellsteapotapplytorussellsteapot
...
Conflicts:
icons/obj/closet.dmi
2015-04-28 22:31:11 +10:00
d9b8b146c8
Tried to fix merge conflicts, hopefully worked.
2015-04-24 21:52:36 +03:00
de280c72b5
Removed some more spans from visible messages.
2015-04-24 21:06:59 +03:00
a7bd5f93e1
"You hear something" set to italics.
2015-04-24 21:06:16 +03:00
1d14471d00
Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark.
2015-04-24 20:50:50 +03:00
15718c515d
fixes opening lockers, atmos locker sprite and misc logging bug
2015-04-23 20:46:40 +10:00
84df0192f4
Buffs Deathsquads.
2015-04-18 00:06:17 +01:00
26ca19e07d
Merge branch 'master' of https://github.com/tgstation/-tg-station into tfwyoubreakyourownfix
...
Conflicts:
code/modules/mining/mine_items.dm
2015-04-17 18:02:45 +10:00
c364d1558a
fireaxe cabinet recode
2015-04-16 17:40:15 +10:00
2ed906b990
Fixes inhand sprites for eggs.
...
Fixes heart underwear sprite being too big.
Fixes being able to push a janicart through plastic flaps.
Fixes ERT medic closet starting with a combat defib with no cell. Empty combat defib can now get a cell inserted.
Fixes inconsistency in nukeop pinpointer upon activation, it now says standard pinpointer message plus the current mode (shuttle or disk).
2015-04-14 17:41:36 +02:00
8610d24a75
merges secure closet code into normal closets, fixes overlay bugs
2015-04-13 17:38:57 +10:00
Ikarrus
Iamgoofball
Swag McYolosteinen
Jordie0608
Xhuis
phil235
xxalpha
kingofkosmos
Razharas
Dorsisdwarf
barackobama
Incoming
Cheridan
astralenigma
phil235
Fayrik