Commit Graph

146 Commits

Author SHA1 Message Date
Chayse Ramsay
f95222fee0 For the stranger there among them had a big iron on his hip. Big iron on his hiiiiiiip. (#12155)
* HoS modular revolver, ported from vore

* Bugfixing, sanity checks etc.

* Update hos.dm

* Sprite fixed

* Automatic changelog compile [ci skip]

* HoS Weapon Selection

* Icons

* Clamp fix, removing rogue items from ye olde list

* Update ammo.dmi

* Requested Changes Part 1

* Beacon fixed (kind of)

* Subtypes fix

* User

* Giving process_chamber a user so that the proc can use to_chat without requiring loc, fixes switching so the gun only switches to the same type when empty

* redundant item

* Adds an examine notice on how to remove the magazine

* Requested Changes

* Icons

Co-authored-by: Changelogs <action@github.com>
2020-05-30 03:17:56 +02:00
ZeroMan
18eb42315e i missed a src 2020-04-28 02:55:25 -04:00
ZeroMan
8dc130175d i actually despise coding 2020-04-28 02:46:46 -04:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
Lin
5ee4a355c1 Merge pull request #11178 from Citadel-Station-13/Ghommie-patch-2
Fixing refrigerators locking when closed
2020-02-29 00:21:43 -06:00
kevinz000
59e95555bb Merge remote-tracking branch 'citadel/master' into staves 2020-02-24 13:09:45 -07:00
Ghom
503214dee6 Update freezer.dm 2020-02-21 02:26:52 +01:00
Ghom
89f256866d Merge pull request #11033 from kevinz000/cmo_drapes
gives CMO special surgery drapes that can initiate techweb surgeries without operating console
2020-02-20 11:24:50 +01:00
kevinz000
8666a36b1e fixes most things 2020-02-18 02:24:31 -07:00
kevinz000
d7949e810e Merge remote-tracking branch 'citadel/master' into staves 2020-02-18 02:20:58 -07:00
kevinz000
70e752dbc9 this is totally not laggy 2020-02-11 23:45:22 -07:00
ShadeAware
bbedf617f5 Declutters the Locker 2020-02-11 17:33:18 -05:00
kevinz000
8556bcf2b3 compile 2020-02-03 13:36:10 -07:00
kevinz000
3e30c9409b riot staves 2020-02-03 13:11:26 -07:00
Ghom
d709edb1c2 Merge pull request #10578 from r4d6/Mining
Port TG's Mining changes
2020-01-18 20:32:14 +01:00
r4d6
ce16c91b2f Code changes 2020-01-16 14:08:14 -05:00
Ghommie
9dad810edf Merge branch 'Ghommie-cit492' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit492 2020-01-12 23:11:02 +01:00
Ghommie
b2ab8959f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit492 2020-01-12 23:00:05 +01:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghom
1a834edd5f f 2020-01-05 21:27:04 +01:00
Seris02
519d379cdf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into atmosfirelock 2020-01-03 17:42:53 +08:00
KathrinBailey
243aebe12a dab 2x 2019-12-31 16:54:59 +00:00
KathrinBailey
0a19f62fa9 dab 2019-12-31 16:45:06 +00:00
KathrinBailey
f2e9ba2a8e Makes lockers into subtypes
Adds new lockers cleanly at the bottom instead and as subtypes.
2019-12-31 16:41:23 +00:00
KathrinBailey
283ccceb24 CE Locker Exodus: The Removaling
Removes junk from the CE locker.
Adds empty engineering lockers.
I don't know how to do this as a child and not have populate contents fill the child.
2019-12-30 09:25:03 +00:00
Ghommie
ffa013af6e Minor captains closet cleanup. 2019-12-25 03:59:21 +01:00
Seris02
61ab3685f1 atmos firelock, changes to temp blocking 2019-12-20 14:14:01 +08:00
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
Ghommie
2c1740f56e #43012 and missing typepaths aaaa 2019-11-13 23:26:03 +01: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
Fermi
c23d6f0113 I missed an earlier port. 2019-09-17 01:08:37 +01:00
Sishen
3281f23eb6 made changes as per bhijns request 2019-08-14 16:30:54 -04:00
Sishen
1f100f1f3b crush my lock with a rock i must 2019-08-03 18:48:14 -04:00
Sishen
8563af71b3 Update security.dm 2019-07-25 21:43:02 -04:00