Commit Graph

1950 Commits

Author SHA1 Message Date
kevinz000
d6f540faf7 Merge pull request #9796 from Ghommie/Ghommie-cit347
Unmodularize airlocks.
2019-11-14 16:24:56 -07:00
kevinz000
2f4562a63b Merge pull request #9656 from Ghommie/Ghommie-cit290
Purging a lot of space indention in favor of tabs.
2019-11-14 15:55:04 -07:00
kevinz000
318c03cc28 Merge pull request #9683 from Ghommie/Ghommie-cit303
Dullahans fixes and QoL.
2019-11-14 15:52:11 -07:00
kevinz000
617b0db310 Merge pull request #9692 from Ghommie/Ghommie-cit309
Unmodularize cargo console, disposal bin, lighting bulbs/tubes and alien nest ruin.
2019-11-14 15:48:34 -07:00
Ghommie
98bc6d6c60 Ports "Ghosts can now see the AI's camera" and "Removes error message while shunting [fix]" 2019-11-14 23:33:37 +01:00
kevinz000
487f98bf68 Merge pull request #9775 from Ghommie/Ghommie-cit340
ports "Adds superlube to the clown ruin", "Replaces the slime extract in the clown biodome with a superlube sprayer." and buffs clown PDAs
2019-11-14 01:40:16 -07:00
kevinz000
06ae6cde09 Update code/datums/weather/weather_types/radiation_storm.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-11-14 01:39:42 -07:00
kevinz000
3015ec5c04 Merge pull request #9764 from Ghommie/Ghommie-cit335
Dreamchecker compatibility changes, part 1.
2019-11-14 01:37:41 -07:00
kevinz000
4e3147b228 Merge pull request #9755 from Ghommie/Ghommie-cit331
lentext to length, yet another 513 requirement.
2019-11-12 23:59:31 -07:00
kevinz000
690d6f90ec Update radiation_storm.dm 2019-11-12 23:50:40 -07:00
kevinz000
53bfbacbe0 Update radiation_storm.dm 2019-11-12 23:48:39 -07:00
kevinz000
d858bd0526 Update radiation_storm.dm 2019-11-12 23:45:47 -07:00
Ghommie
b83f92be0e Unmodularize airlocks. 2019-11-13 06:50:35 +01:00
Ghommie
7348693338 chucklefucks. 2019-11-12 15:53:54 +01:00
Ghommie
e50c56150e ports "Adds superlube to the clown ruin" and buffs clown PDAs 2019-11-11 23:10:22 +01:00
Lin
df051186eb Merge branch 'master' into abductor-update 2019-11-11 00:08:59 +00:00
Ghommie
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
Ghommie
1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
kevinz000
76e31a2799 Merge pull request #9745 from Ghommie/Ghommie-cit327
rad flags fixes.
2019-11-10 11:44:17 -07:00
kevinz000
d1f6483687 Merge pull request #9704 from Ghommie/Ghommie-cit314
Minor ninja tweaks and stealth nerf.
2019-11-10 11:31:25 -07:00
kevinz000
e0626d12b1 Merge pull request #9707 from BonniePandora/Weldhelmets
Port Welding Hard Hats from /tg/
2019-11-10 11:30:54 -07:00
kevinz000
1493863533 Merge pull request #9716 from Ghommie/Ghommie-cit317
Porting objective code refactor (ergo fixing abductors/abductees objective by updating the code)
2019-11-10 11:27:04 -07:00
kevinz000
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
Seris02
2d9f463fd7 fixes a typo 2019-11-10 15:48:40 +08:00
Seris02
99ea3f9b71 more fixes + fixes the last fixes. 2019-11-10 15:09:17 +08:00
Seris02
7dc22e3ae0 makes rising bass a little less hacky with code 2019-11-10 10:25:23 +08:00
Ghommie
279c22b781 lentext to length. 2019-11-09 23:17:04 +01:00
Seris02
68014392ca Fixes the fork? 2019-11-09 21:38:17 +08:00
Seris02
8a4197bbf5 Merge branch 'rising_bass' of https://github.com/Seris02/Citadel-Station-13 into rising_bass 2019-11-09 21:15:54 +08:00
Seris02
8dfbc652cb ADDS THE NEW MARTIAL ART - RISING BASS!! 2019-11-09 21:11:36 +08:00
Ghommie
c0c130324e Some consistency tweaks. 2019-11-08 22:53:59 +01:00
Ghommie
298f2e02c6 Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron. 2019-11-08 22:33:26 +01:00
Ghommie
03a7fc3818 rad flags fixes. 2019-11-08 19:15:58 +01:00
Seris02
b9238d0290 copying my file from my mac
henk
2019-11-08 20:14:41 +08:00
Seris02
6b774745b3 adds the rising bass file so I can port the file over from my mac 2019-11-08 20:06:42 +08:00
Ghommie
509fbdf476 initial. 2019-11-07 05:34:02 +01:00
Ghommie
3c6b1109f1 I'm tired. 2019-11-07 00:40:39 +01:00
Ghommie
892b66470b Fixing several minor runtimes. 2019-11-05 23:07:29 +01:00
Ghommie
43014a8729 Riding component fix and hacky mood runtimes workaround. 2019-11-05 07:33:43 +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
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
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
Ghommie
286b78c84c Minor ninja tweaks and stealth nerf. 2019-11-03 17:14:55 +01:00
kevinz000
0fa57f6102 Merge pull request #9660 from Ghommie/Ghommie-cit293
Fixing riding component runtimes, how drifting...
2019-11-03 06:19:56 -07:00
kevinz000
bd29bd1e36 Merge pull request #9668 from Putnam3145/starlight
Gives ways for various slime-killing healing viruses not to do that.
2019-11-03 06:18:01 -07:00
kevinz000
906c58d339 Merge pull request #9672 from Ghommie/Ghommie-cit299
Obligatory changes for 513 support kevinz forgot about.
2019-11-03 06:15:42 -07:00
kevinz000
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
Ghommie
592d1a4b54 Unmodularize cargo console, disposal bin, lighting bulbs/tubes and alien nest ruin. 2019-11-03 01:55:59 +01:00
Putnam
9506a78429 whoops replaced this var with a simpler check 2019-11-01 18:46:31 -07:00