Commit Graph

1970 Commits

Author SHA1 Message Date
Trilbyspaceclone febceaa2d6 Apply suggestions from code review
grammar

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-11-22 14:39:31 -05: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
Lin 522a664f55 Merge pull request #9887 from Ghommie/Ghommie-cit385
Martial arts pacifism fixes and boxing buff, more ported pacifist fixes.
2019-11-22 02:39:29 +00:00
Lin 1ddb9935ff Merge pull request #9530 from Ghommie/Ghommie-cit245
Touching up job outfits equip procs, little PDA fix.
2019-11-22 02:37:49 +00:00
Persi 863b2398ac Removes the night vision quirk 2019-11-21 06:19:37 -05:00
Ghommie 84d1315a05 heck. 2019-11-20 21:33:35 +01:00
Ghommie 16d850ecfc chain stunning yay 2019-11-20 21:17:31 +01:00
Ghommie 236f22096a run 2019-11-20 21:13:08 +01:00
Ghommie 2fddf343ad Run 2019-11-20 21:12:44 +01:00
Ghommie 67a48e0417 typo 2019-11-20 21:03:27 +01:00
Ghommie aab7ad192b Martial arts pacifism fixes and boxing buff, more ported pacifist fixes. 2019-11-20 21:00:17 +01:00
Ghommie 21f15e411d Part 3 2019-11-19 19:34:42 +01:00
Useroth 6e2ff6ce3c Prevents storage bags from re-ordering their contents when items are removed. 2019-11-19 16:13:57 +01:00
Linzolle f9b632019b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-11-18 21:39:45 -06:00
DeltaFire15 9f8547d42d Another sync (#4)
AAAAAAAAA
2019-11-16 16:12:12 +01:00
kevinz000 21775ad3ee Merge pull request #9813 from Ghommie/Ghommie-cit355
Ports "Ghosts can now see the AI's camera" and "Removes error message while shunting [fix]"
2019-11-16 01:24:58 -07:00
Lin 6aa6eaafe6 Merge branch 'master' into abductor-update 2019-11-15 23:24:51 +00:00
Ghommie f401e622c3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329 2019-11-15 01:01:08 +01:00
kevinz000 746bbccb9c Merge pull request #9723 from Ghommie/Ghommie-cit321
Riding component fix and hacky mood runtimes workaround.
2019-11-14 16:46:54 -07:00
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