Commit Graph

158 Commits

Author SHA1 Message Date
Lin 6368f04f2d Merge pull request #10044 from Ghommie/Ghommie-cit423
Made wooden cabinet/closets... actually made of wood.
2019-12-08 22:18:15 +00:00
Ghommie 3f0d1e275e Made wooden cabinet/closets... actually made of wood. 2019-12-04 18:27:17 +01:00
TrilbySpaceClone e1717bb534 Merge branch 'master' into crow 2019-12-03 23:45:05 -05:00
Lin b501321362 Merge pull request #9941 from Putnam3145/personal-closet-fix
Personal closets can use PDAs/tablets now
2019-12-03 01:38:42 +00:00
Putnam 66d1b88725 Get 2019-11-25 22:23:50 -08:00
Putnam 1283149fb2 also allowed wallets 2019-11-25 22:22:16 -08:00
Unknown 4e20f576e6 Merge branch 'master' into xantholne-berets02 2019-11-25 20:16:15 -07:00
Putnam 639c07665d Personal closets can use PDAs/tablets now 2019-11-25 02:00:03 -08:00
BlackMajor c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
Lin 028fa518e4 Merge pull request #9879 from Ghommie/Ghommie-cit383
Unmodularize closets.
2019-11-23 05:39:33 +00:00
TrilbySpaceClone b01be3b1ff Merge branch 'master' into crow 2019-11-22 05:48:36 -05:00
TrilbySpaceClone 2136968585 Ring ring 2019-11-21 21:55:17 -05:00
Unknown 4974400ccb Merge branch 'master' into xantholne-berets01 2019-11-21 11:01:42 -07:00
Unknown 71b3b8fdc6 Ports/Adds new Berets
Ports some berets adds even more to most jobs
2019-11-20 22:21:20 -07:00
Ghommie 10373c7c96 Unmodularize closets. 2019-11-20 06:41:59 +01:00
Ghommie a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01:00
Seris02 b146fd14f3 actually adds the winter coats 2019-11-16 18:25:05 +08:00
kevinz000 ca99a8285c Merge pull request #9803 from Ghommie/Ghommie-cit350
Ports Improved beach away mission and some fluff mapping items.
2019-11-14 16:36:19 -07:00
Ghommie 2c1740f56e #43012 and missing typepaths aaaa 2019-11-13 23:26:03 +01:00
Dap 041c35202b Ports Closet & Crate Initialization Fixes
Ports a similarly named pull request (thank you cool cat).
2019-11-10 14:17:34 -07:00
BonniePandora 5efed32095 Ports Welding Hard Hats from /tg/
Changelog:
modules/clothing/head/Hardhat.dm:
-Added Welder Hard Hats & various colours
--They function as a combi hard hat & welder mask, but have a slightly dimmer head lamp
modules/clothing/vending/wardrobes.dm
-Added 3 Welder Hard Hats to the Engi-drobe and Atmos-drobe
-Equalized some values between the two (3 atmos winter coats now instead of 5, and 3 engineering dufflebags instead of 2)
game/objects/structures/crates_lockers/closets/secure/engineering.dm
-Replaced the welding mask in the CE's locker with a white WHH (This one has brighter buld in it! Same brightness as a regular hard hat)
datums/action.dm
- Added the item_action to lower the WHH's face shield
icons/mob/head.dmi
-Added weldervisor + welderhat, which are used by the WHH's
-Recoloured hardhat0/1_dblue to be in atmos colours as I've never seen it on the station before and this way is actually used
icons/mob/obj/hats.dmi
-Added weldervisor, again, used by the WHH's
-Repositioned the hardhat sprites up several pixels so they don't clip and look weird with the weldervisor
-Recoloured hardhat0/1_dblue to be in atmos colours as I've never seen it on the station before and this way is actually used
2019-11-04 02:29:56 +00:00
deathride58 2742c86723 Merge pull request #9072 from Poojawa/gen-poppers
Genpop for security
2019-10-21 21:15:01 -04:00
Fermi 587568bf88 Merge branch 'master' into tg-Organ-port 2019-09-19 01:33:15 +01:00
Fermi c23d6f0113 I missed an earlier port. 2019-09-17 01:08:37 +01:00
Poojawa fa364bbad0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into gen-poppers 2019-09-13 13:00:29 -05:00
Linzolle 64b757f404 refactor suits 2019-09-07 17:10:10 -05:00
Sishen 3281f23eb6 made changes as per bhijns request 2019-08-14 16:30:54 -04:00
Poojawa b5841c718b Genpop for security 2019-08-07 06:14:35 -05:00
Sishen 1f100f1f3b crush my lock with a rock i must 2019-08-03 18:48:14 -04:00
Sishen 68083aa0c6 a 2019-07-25 21:43:02 -04:00
Sishen 8563af71b3 Update security.dm 2019-07-25 21:43:02 -04:00
Sishen 612021b9d5 h 2019-07-25 21:43:02 -04:00
Ghommie 589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
Ghommie 7706ec6329 I LOVE THE SMELL OF NAPALM IN THE MORNING! 2019-06-09 02:45:14 +02:00
Cyprian 81fde9c7a6 Forgot to add the CE beret to the CE locker. 2019-04-06 23:34:10 +02:00
Cyprian 644a5a1e66 Berettide! 2019-04-06 22:52:26 +02:00
Trilbyspaceclone 7a2088aba6 Adds usefull tools/healing items to utility lockers - Requested by LeonDuvall (#7974)
* Update utility_closets.dm

* Update firstaid.dm

* Update pill.dm

* Update hypospray.dm

* Update firstaid.dm

* Update pill.dm
2019-02-13 20:46:55 -08:00
Trilbyspaceclone ddf833d16c [Ready] Makes Adv surgery tools more common around the station! (#7938)
* Fixing updater

* Adds the belt with tools!

* Adds belt to CMO locker

* Synda bag

* Adds the medical bag to uplink

* adds in cargo crate

* Apply suggestions from code review

Rag spelling check a base line item I guess

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>

* Apply suggestions from code review

Spell check Rag at it again fixing Trilbys failers

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
2019-02-08 05:26:42 -08:00
Redtail 4c7075f1a8 New medals added.
add:  Two new medals for engineering and medical to give out.
2018-12-08 12:12:36 -06:00
Poojawa d231018a3a Flashy flash and Gondola Pods
and cult effect addition, fixes CTF
2018-09-21 02:48:17 -05:00
Poojawa 7d300117af literally everything Bhjin has been complaining about
also modularizes stuff and adds more comments. Like responsible downstream repos should have.
2018-09-18 03:59:46 -05:00
Poojawa 8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
deathride58 b604390f33 Ports tgstation/tgstation#39302 with adjustments, see desc of commit (#7424)
Instead of the box being 100% invisible at all times, the box will steadily become more and more visible as you move. The faster you move, the more visible the box becomes. The box will slowly become invisible again every process() cycle.
This also makes the box inherit the movement delay of it's user, meaning you're able to sprint while moving inside boxes, or walk to slow yourself down.
2018-09-07 05:40:53 -07:00
Tupinambis afcf52f5d8 This time it should actually work. I forgot to compile the first because I am an idiot haha yes. 2018-08-31 18:05:10 -05:00
kevinz000 2a6e4fce59 Photography Update 2018-07-20 15:26:13 -07:00
deathride58 3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58 ac6fddcfb3 Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync 2018-07-05 00:17:44 -04:00
Letter N abc32ed0df adds "cap's female formal outfit" (#7307)
* Update under.dm

* modifies cit_clothes.dmi

* Updates uniforms.dmi

* Update security.dm

* now wont remove other clothing stuff (TM)

* Add files via upload

* Update under.dm
2018-07-04 05:37:01 -07:00
deathride58 91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
LetterJay fb53413ded Merge pull request #7160 from Citadel-Station-13/upstream-merge-38270
[MIRROR] [READY] advanced foam extinguisers [READY]
2018-06-18 12:28:42 -05:00