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
6cc17a6243
Resolved Conflicts:
...
code/modules/clothing/clothing.dm
code/modules/clothing/masks/gasmask.dm
code/modules/clothing/suits/bio.dm
code/modules/clothing/suits/utility.dm
2015-06-27 00:17:02 -06:00
8759f56f6f
Squashed Commits
2015-06-27 00:09:16 -06:00
f06abf3e2f
fixes compile error
...
One pr added a path to an item(#10018 ) but another pr changed that path(#9932 ).
2015-06-26 16:06:37 -07:00
ee13658752
Merge pull request #10018 from pudl/sam
...
Abandoned Crates (Ported from Baystation12)
2015-06-26 19:07:58 +02: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
a2948ba203
Merge pull request #9956 from Jordie0608/whocodesthecodemen
...
Various admin improvements
2015-06-20 00:53:30 -05:00
c2087e8cea
fix according to miauw
2015-06-18 12:02:05 -05:00
62b2b87307
buffed explosion, removed message
2015-06-18 08:41:50 -05:00
8a8dde0f73
whoops
2015-06-18 04:56:09 -05:00
a7b9c7d9c9
user.incapacitated and other player requests
2015-06-18 03:22:59 -05:00
ab103b54dc
Righted some checks.
...
If newcolor
2015-06-17 21:03:11 +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
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
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
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
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
5ef93b2225
overlays for computers
2015-06-13 20:07:48 +10:00
532d992b02
"IT'S ONLY LOGGING, WHAT'S THE WORST THAT COULD HAPPEN???"
...
famous last words
merge asap
2015-06-11 16:07:22 -07:00
f992eb1af0
Adds feedback gathering for a hell of a lot more things.
2015-06-09 21:52:46 -07:00
47a02231f1
Merge pull request #9813 from Iamgoofball/constructionjunctionwhatsyourfunction
...
Upgrade Update: Bluespace Boogaloo
2015-06-09 08:48:51 +03:00
21e4ae4b93
insert time for gibber now effected by upgrades, fixes, RECYCLER NOW MORE EFFICIENT
2015-06-06 13:28:59 -07:00
3c1a0dd0d5
SMARTFRIDGE, SEED EXTRACTOR, and MONKEY RECYCLER are now buildable. ORE REDEMPTION MACHINE can now be upgraded.
2015-06-06 12:47:11 -07:00
6c12887367
Pressure_resistance Tweaks
...
-Adjusts pressure resistance, which determines how easily things can get pushed around by atmos.
-Most items (handheld stuff) are less resistant, while most larger items (mobs, structures, machinery) are more resistant.
-Removes the cooldown on air pushing stuff, which should make it feel more 'responsive', as opposed to the current push->pause->push->pause effect it does now.
-MAGBOOTS/NOSLIPS NOW PREVENT SPACEWIND PUSHING! !!!
-Adds a little wooshy breeze sound to when you would get pushed
2015-06-03 23:22:25 -05:00
a19f1801ff
Merge pull request #9699 from KorPhaeron/turf
...
Changes how destroying/building turfs works
2015-06-02 23:15:42 -05:00
e7c0d7e95c
Removes unsimulated turfs.
...
Moves shuttle turfs to paths under /turf/simulated/floor and /turf/simulated/wall
Players can now safely build on top of shuttle turfs
Fixes #1711
Adds several but not all paths for the different types of floor turfs, most of them in plasteel_floor.dm
The turf pathings are still in need of a deeper organization, but this is at least a start
2015-06-01 23:24:18 -03:00
97990c94cc
Changes how destroying turfs works
...
Turfs now have a baseturf var which determines what is "under" every
turf. The default is space.
Actions that previously did changeturf(/turf/space) (like bombs or RCD
deconstruction) now do changeturf(baseturf). Functionally the same for
the station, but allows special turf types that don't break to space
(such as planet tiles).
Right now the asteroid tiles are the only thing with a baseturf other
than space (the baseturf is an asteroid tile).
Baseturf is tracked when new things are built, so building a floor and
then a wall on the asteroid tile, and then bombing that wall will return
it to an asteroid tile, not space.
Allows building on asteroid tiles now that doing so wont randomly make
holes to space. Time for giant mining forts.
I should have done this years ago for away missions.
Also added myself to admins.txt
2015-05-29 18:43:34 -05:00
28cd8ea0f1
Image Caches:
...
Mining rock turf edge overlays
Alien weed overlays
SMES overlays
2015-05-14 16:40:15 +01:00
4628bb7a15
Conflict resolution
...
With myself. I have internal demons.
2015-05-09 11:49:11 -05:00
7c9667db38
Merge remote-tracking branch 'remotes/upstream/master' into The_Machine_Spirit_Sings_To_Me
2015-05-09 11:40:44 -05:00
155ddec1f4
Removes Mining Drill from voucher choices
...
- Removed mining drill from voucher choices
- Minor oversight fixed in rechargers.
2015-05-08 11:53:48 -05:00
26df5b6c8e
Removes mining drill power mechanic.
...
- Removes the power mechanic from mining drills and the sonic
jackhammer.
- Fixes broken borg diamond drill upgrade.
2015-05-08 10:12:22 -05:00
45f2336413
Fixes the mining borg diamond drill upgrade
...
- Made the borg diamond drill upgrade a child of the standard borg
mining drill.
2015-05-06 10:09:57 -05:00
4e1b27c08b
Merge pull request #9135 from Incoming5643/validsalid
...
Adds Antag Tokens!
2015-04-25 19:14:34 +10:00
a5fc495a27
please don't tell anyone I forgot how to spell salad
2015-04-24 17:55:53 -04:00
761d31cea0
More visible.message span classes removed.
2015-04-24 21:24:21 +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
6e25a57230
Adds Antag Tokens!
...
They're a novelty coin with a syndie helmet (valid) on one side and a salid (salid) on the other.
Found as a prize in arcade machines, Sec can also get one from their vendor as a premium item.
2015-04-23 19:08:38 -04:00
1f9351c3fd
Merge pull request #8925 from xxalpha/ripped
...
Low pressure environment Ripley buff & Mecha Mining Scanner.
2015-04-22 17:49:57 +10: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
a8b9fef6ba
Made a proc for mineral scanning.
2015-04-16 20:28:47 +01:00
bf6ae43aec
Merge pull request #8917 from phil235/BorgDrillFix
...
Fixes miner cyborg being able to eject their drill's cell.
2015-04-14 17:19:27 -05:00
ba772b3291
derp.
2015-04-13 16:34:49 +02:00
8610d24a75
merges secure closet code into normal closets, fixes overlay bugs
2015-04-13 17:38:57 +10:00
b842c800a8
Fixes miner cyborg being able to eject their drill's cell.
2015-04-12 16:18:42 +02:00
81da573b8d
adds speak emote to a lot of simple animals that lacked them
2015-04-10 18:44:51 -04:00
Ikarrus