DeltaFire
cf581b96b5
more lizzers!
...
Adding the code for some lizzer plushies, will commit icons after rosarks PR is merged to avoid conflicts
2019-11-08 17:34:57 +01:00
Seris02
a5a483fb8a
makes meteor hallucinations have an ETA now
2019-11-08 19:55:27 +08:00
BlackMajor and GitHub
aaff0bf9e7
Merge pull request #9705 from kappa-sama/patch-4
...
thanks major
2019-11-08 14:17:59 +13:00
BlackMajor and GitHub
a6bbe75c36
Merge pull request #9611 from Citadel-Station-13/supply-passive-gen
...
Adds passive point generation to cargo. Nerfs miasma selling. Increases mindshield crate price.
2019-11-08 14:17:17 +13:00
Ghommie
509fbdf476
initial.
2019-11-07 05:34:02 +01:00
TrilbySpaceClone
0662245d80
corrections
2019-11-06 22:52:44 -05:00
Ghommie
3c6b1109f1
I'm tired.
2019-11-07 00:40:39 +01:00
Ghommie
ae6e50b081
resprited delivery packages.
2019-11-06 18:27:33 +01:00
BlackMajor
026f9758b9
Actually wait that's way simpler
2019-11-06 12:55:25 +13:00
BlackMajor
960de09a96
Oh there's even more
2019-11-06 12:49:50 +13:00
BlackMajor
9efddbe580
thank you dark souls
2019-11-06 12:47:21 +13:00
Ghommie
97dd0bd70c
Yes.
2019-11-05 23:13:10 +01:00
Ghommie
892b66470b
Fixing several minor runtimes.
2019-11-05 23:07:29 +01:00
rosko
cc8423ac45
adds a lizzard plushie
...
yet another player plushie....this one comes with a real fake maxcap
2019-11-05 20:38:44 +02:00
Ghommie
ae9ff92d33
Fixes free real estate paraplegic trait and bolas.
2019-11-05 18:03:50 +01:00
Anonymous
0849ea365f
Merge branch 'master' into assu
2019-11-05 15:45:04 +03:00
Winter Flare
4b6d9848ff
Update assistant.dm
2019-11-05 01:44:15 -05:00
Winter Flare
74b5961a8d
Removed an unneeded line, added gas masks
2019-11-05 01:43:38 -05:00
Winter Flare
87695c0a21
Moved some stuff around, added some more.
...
Moved Strange Objects and Sunglasses into silly.dm, modified a few of the bounty prices.
2019-11-05 00:22:22 -05:00
Ghommie
9cac543a2b
Unmodularize secway and turfs
2019-11-05 05:47:25 +01:00
Ghommie
a650e1e411
Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness"
2019-11-05 05:37:28 +01:00
Trilbyspaceclone and GitHub
09cd439f85
so dumb that github suggestions brake "
2019-11-04 17:24:37 -05:00
Ghommie
4ab3512dda
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281
2019-11-04 23:15:12 +01:00
Trilbyspaceclone and GitHub
061579decb
no fun allowed
2019-11-04 17:08:55 -05:00
Trilbyspaceclone and GitHub
28b96494e6
huh
2019-11-04 17:03:00 -05:00
Ghommie
29daa0c908
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290
2019-11-04 22:59:24 +01:00
Ghommie
8c31c1036d
Porting objective code refactor
2019-11-04 22:05:04 +01:00
Ghommie
1a2901f197
Ports CEV-Eris matchbox respriting, also respriting cigar boxes.
2019-11-04 16:14:12 +01:00
cb215be40d
Apply suggestions from code review
...
dap the hero
Co-Authored-By: dapnee <33661984+dapnee@users.noreply.github.com >
2019-11-04 07:21:30 -05:00
TrilbySpaceClone
ae8b43e1c0
Update tea_coffee.dm
2019-11-04 06:05:10 -05:00
Trilbyspaceclone and GitHub
fe87eec45c
i hate mob code
2019-11-04 00:58:51 -05:00
TrilbySpaceClone
526d9b203c
aliens
...
man
2019-11-04 00:34:03 -05: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
Trilbyspaceclone and GitHub
8a9e0dbbe3
pen b gone
2019-11-03 20:49:03 -05:00
kappa-sama and GitHub
9f04cba7bf
workaround
2019-11-03 18:27:47 -05:00
Ghommie
dcc81d92b5
Fixing a few throw_at calls and modular computer processors Init.
2019-11-04 00:12:41 +01:00
TrilbySpaceClone
82b148b7b7
Merge branch 'master' into Cargo_MKII
2019-11-03 17:53:06 -05:00
TrilbySpaceClone
40a47bb4e9
Merge branch 'Cargo_MKII' of https://github.com/Trilbyspaceclone/Citadel-Station-13 into Cargo_MKII
2019-11-03 17:26:38 -05:00
TrilbySpaceClone
bd4501e11c
the last touches?
2019-11-03 17:26:28 -05:00
Trilbyspaceclone and GitHub
3ab70cbc26
Update sheets.dm
2019-11-03 13:04:48 -05:00
Trilbyspaceclone and GitHub
9af899c9c3
cleaning up
2019-11-03 12:59:41 -05:00
Trilbyspaceclone and GitHub
50b4e76764
Update bottle.dm
2019-11-03 12:58:31 -05:00
TrilbySpaceClone
a8248c68f4
perhaps
2019-11-03 12:53:02 -05:00
Ghommie
543df8822e
.len
2019-11-03 18:17:34 +01:00
Ghommie
efbcce023a
Oh yea it won't work otherwise.
2019-11-03 18:16:19 +01:00
Ghommie
431ab8fc0b
better be safe than sorry.
2019-11-03 17:56:30 +01:00
Ghommie
4b667743b9
Regenerating limbs won't no longer gib dullahans.
2019-11-03 17:50:03 +01:00
Ghommie
76294cf162
oh flak.
2019-11-03 17:29:53 +01:00
Ghommie
286b78c84c
Minor ninja tweaks and stealth nerf.
2019-11-03 17:14:55 +01:00
4fa6c4d5c0
Apply suggestions from code review
...
Co-Authored-By: dapnee <33661984+dapnee@users.noreply.github.com >
2019-11-03 11:10:30 -05:00
DeltaFire