09860d463f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-11-10 23:23:36 +01:00
e977ba6729
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290
2019-11-10 23:17:58 +01:00
56720ea99c
Merging kevinz's plush PR into mine
...
Adds the kara plushie, the new skylar sprite and the trillby fix into the code, all without any missing syntax elements! Yay!
2019-11-10 22:27:06 +01:00
041c35202b
Ports Closet & Crate Initialization Fixes
...
Ports a similarly named pull request (thank you cool cat).
2019-11-10 14:17:34 -07:00
1e49ce76d3
Dreamchecker compatibility changes, part 1.
2019-11-10 20:48:30 +01:00
92455b5b8c
Merge pull request #9695 from Ghommie/Ghommie-cit311
...
Unmodularize and update pAI/Intellicards very slighty.
2019-11-10 11:40:14 -07:00
e8219dd9f7
Merge pull request #9697 from Poojawa/patch-1
...
Better Health Analyzer formatting
2019-11-10 11:35:07 -07:00
e0626d12b1
Merge pull request #9707 from BonniePandora/Weldhelmets
...
Port Welding Hard Hats from /tg/
2019-11-10 11:30:54 -07:00
487e1806e7
Merge pull request #9709 from Trilbyspaceclone/cargo_memes_3
...
Adds 8 more sci crates to cargo
2019-11-10 11:30:33 -07:00
501dfbb43a
Merge pull request #9715 from Ghommie/Ghommie-cit316
...
Ports CEV-Eris resprited matchbox, also respriting cigar boxes myself.
2019-11-10 11:27:36 -07:00
c46b425402
Merge pull request #9719 from Ghommie/Ghommie-cit318
...
Renames is_hot and is_sharp to get_temperature and get_sharpness, just like how ol tg did.
2019-11-10 11:26:06 -07:00
7ab4d2f013
Viva la wehvolution
...
Adding the plushies code after syncing with ros's changes
2019-11-10 17:39:43 +01:00
279c22b781
lentext to length.
2019-11-09 23:17:04 +01:00
8dfbc652cb
ADDS THE NEW MARTIAL ART - RISING BASS!!
2019-11-09 21:11:36 +08:00
96a8302dac
Fine you can boh bomb again
2019-11-08 21:11:44 -05:00
5e1ab01733
What do you mean I cant hold the armory on my back?
...
But mmmmmuuuummmm I want to have 12 duffle bags in my bag of holding!!!
2019-11-08 21:05:30 -05:00
298f2e02c6
Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.
2019-11-08 22:33:26 +01:00
6dc3fca905
makes gps show location on examine
2019-11-08 19:24:54 +08:00
b2b1390bd3
Ports techweb backend refactor & co.
2019-11-07 05:07:38 +01:00
0662245d80
corrections
2019-11-06 22:52:44 -05:00
892b66470b
Fixing several minor runtimes.
2019-11-05 23:07:29 +01:00
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
a650e1e411
Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness"
2019-11-05 05:37:28 +01:00
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
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
1a2901f197
Ports CEV-Eris matchbox respriting, also respriting cigar boxes.
2019-11-04 16:14:12 +01:00
526d9b203c
aliens
...
man
2019-11-04 00:34:03 -05:00
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
82b148b7b7
Merge branch 'master' into Cargo_MKII
2019-11-03 17:53:06 -05:00
9af899c9c3
cleaning up
2019-11-03 12:59:41 -05:00
5c4cd15762
Hmm
2019-11-03 11:05:45 -05:00
6462d0c8c8
Merge pull request #9658 from Ghommie/Ghommie-cit291
...
Fixing dogborg sleepers runtimes, how atrocious...
2019-11-03 06:20:30 -07:00
0fa57f6102
Merge pull request #9660 from Ghommie/Ghommie-cit293
...
Fixing riding component runtimes, how drifting...
2019-11-03 06:19:56 -07:00
3a2ce8c5ce
Merge pull request #9679 from Ghommie/Ghommie-cit302
...
Ports "Replaces the rpg loot datum with a component and makes some suffixes have real effects" & co
2019-11-03 06:14:13 -07:00
dcee360ac5
Merge pull request #9686 from Ghommie/Ghommie-cit304
...
Fixing storage implant transplant.
2019-11-03 06:11:20 -07:00
d8e0771dcd
Better Health Analyzer formatting
...
Because having it all bunched up is a pet peeve.
2019-11-02 23:14:39 -05:00
7e4aef46d9
Unmodularize and update pAI/Intellicards very slighty.
2019-11-03 04:23:31 +01:00
0cce37cedb
How many times I have encountered theis sort of issues in the past and how much of a meme it was...
2019-11-02 20:18:40 +01:00
e02849fab7
double deletion dip sauce, now with 30% more cpu waste.
2019-11-02 19:54:20 +01:00
065fbdf0cb
Fixing gibspawner runtimes, how gruesome...
2019-11-02 19:37:35 +01:00
91625b6e60
item/doMove() calling dropped() callign qdel(src) because of DROPDEL.
2019-11-02 14:15:31 +01:00
874cdfefb8
fixing storage implant transplant.
2019-11-02 14:03:14 +01:00
986c4e11c0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit245
2019-11-02 02:32:23 +01:00
d9c38d0589
Merge pull request #8948 from Ghommie/Ghommie-cit156
...
Cleaning up the arousal module.
2019-10-31 17:27:03 -07:00
6cf35a67b1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290
2019-10-31 23:17:39 +01:00
b653595702
Ports "Replaces the rpg loot datum with a component and makes some suffixes have real effects" & co
2019-10-31 22:40:11 +01:00
17e794bd59
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281
2019-10-31 01:43:44 +01:00
b17346a44e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit220
2019-10-30 14:46:42 +01:00
266f1ff958
Merge remote-tracking branch 'upstream/master' into abductor-update
2019-10-29 23:58:01 -05:00
be752c1fb0
Merge pull request #9531 from Ghommie/Ghommie-cit246
...
Little stunbaton nerf (split off from #9500 )
2019-10-29 21:43:45 -07:00
Ghommie