shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,898 Commits 5 Branches 0 Tags
e292b050f8a413c3f643b20664f2ea3dcf6f4e21
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58andGitHub 6633aff679 Merge pull request #5167 from deathride58/shitcodepatch 
Cleans up useless ..()s in cit_screenshake.dm
 2018-01-29 02:31:27 +00:00
deathride58andGitHub 3e2292ac1d Merge pull request #5166 from Cyberboss/patch-1 
Fixes the mapdiffbot issue
 2018-01-29 02:31:15 +00:00
deathride58andGitHub 5a08f15eb6 Merge pull request #5163 from Citadel-Station-13/upstream-merge-35029 
[MIRROR] The long dark blue line continues. (Adds academy to random station names.)
 2018-01-29 02:31:02 +00:00
deathride58andGitHub 9dc6a9dacb Merge pull request #5161 from Citadel-Station-13/upstream-merge-34992 
[MIRROR] Microwave Powercrêpe
 2018-01-29 02:30:49 +00:00
deathride58andGitHub 1e9e50fa03 Merge pull request #5160 from Citadel-Station-13/upstream-merge-34939 
[MIRROR] Increases Drone Speed
 2018-01-29 02:30:34 +00:00
deathride58andGitHub 34b93a8d42 Merge pull request #5159 from Citadel-Station-13/upstream-merge-34926 
[MIRROR] Makes revenants spawn on dead bodies & bodycontainers
 2018-01-29 02:30:17 +00:00
deathride58andGitHub 7673583ce1 Merge pull request #5157 from Citadel-Station-13/upstream-merge-35025 
[MIRROR] Warp whistle now respects notransform
 2018-01-29 02:29:18 +00:00
deathride58andGitHub 539621a846 Merge pull request #5127 from Citadel-Station-13/upstream-merge-34875 
[MIRROR] Removes overhead and fixes null runtime with NAMEOF
 2018-01-29 02:29:00 +00:00
deathride58andGitHub 90cd07e798 Merge pull request #5109 from Citadel-Station-13/upstream-merge-34913 
[MIRROR] Fixes not being able to stop tail wagging
 2018-01-29 02:28:31 +00:00
deathride58andGitHub 28bd203f41 Merge pull request #5118 from Citadel-Station-13/supply-console-security 
Restricts Supply Console to Quatermaster access
 2018-01-29 02:28:07 +00:00
deathride58 ad15cbab33 cleans up ..() in cit_screenshake.dm 2018-01-28 21:22:28 -05:00
deathride58andGitHub acb7d1827b Merge pull request #5119 from Citadel-Station-13/upstream-merge-34884 
[MIRROR] Fixes pneumatic cannon contents deletion
 2018-01-26 15:55:30 +00:00
deathride58andGitHub b0712e4892 Merge pull request #5116 from Citadel-Station-13/upstream-merge-34915 
[MIRROR] Fixed the simple rotation component
 2018-01-26 15:55:10 +00:00
deathride58andGitHub 0dcb98f754 Merge pull request #5115 from Citadel-Station-13/upstream-merge-34918 
[MIRROR] Correct spelling of armament
 2018-01-26 15:54:46 +00:00
deathride58andGitHub 86fa4871a6 Merge pull request #5114 from Citadel-Station-13/upstream-merge-34910 
[MIRROR] Fixes Ketrazine recipe
 2018-01-26 15:54:25 +00:00
deathride58andGitHub 870f2320b5 Merge pull request #5112 from Citadel-Station-13/upstream-merge-34906 
[MIRROR] Removes Sulfuric Acid requirements from computer parts
 2018-01-26 15:53:14 +00:00
deathride58andGitHub d8434f2b4a Merge pull request #5111 from Citadel-Station-13/upstream-merge-34904 
[MIRROR] fixes pancake runtimes
 2018-01-26 15:52:55 +00:00
deathride58andGitHub ebfa263653 Merge pull request #5110 from Citadel-Station-13/upstream-merge-34897 
[MIRROR] Fixes orbiting stopping when entering disposals
 2018-01-26 15:52:39 +00:00
deathride58andGitHub 3c017a55ec Merge pull request #5108 from Citadel-Station-13/upstream-merge-34891 
[MIRROR] Fixes airlocks playing closing sound while already closed
 2018-01-26 15:50:57 +00:00
deathride58andGitHub a539f6103a Merge pull request #5107 from Citadel-Station-13/upstream-merge-34881 
[MIRROR] Adds Pax to the Peacekeeper Borg's "Peace Hypospray"
 2018-01-26 15:50:38 +00:00
deathride58andGitHub 20eca7bc22 Merge pull request #5106 from Citadel-Station-13/upstream-merge-34852 
[MIRROR] Power Cell explosions are now log
 2018-01-26 15:49:55 +00:00
deathride58andGitHub ba98d2a7f1 Merge pull request #5105 from Citadel-Station-13/upstream-merge-34899 
[MIRROR] clear_zeroth_law sanity check
 2018-01-26 15:49:34 +00:00
deathride58andGitHub 5e6000d02d Merge pull request #5104 from Citadel-Station-13/upstream-merge-34900 
[MIRROR] Syringe update_icon sanity
 2018-01-26 15:48:53 +00:00
deathride58andGitHub 9118715588 Merge pull request #5103 from Citadel-Station-13/upstream-merge-34901 
[MIRROR] Fixes brains being left in hands after being inserted into heads
 2018-01-26 15:48:28 +00:00
deathride58andGitHub 5bc3ad8016 Merge pull request #5102 from Citadel-Station-13/upstream-merge-34876 
[MIRROR] Nuke op intelligence potions also grant an internal ID
 2018-01-26 15:47:56 +00:00
deathride58andGitHub 90611e16ed Merge pull request #5101 from Citadel-Station-13/upstream-merge-34873 
[MIRROR] Fixes Infinite Airlock Materials
 2018-01-26 15:47:29 +00:00
deathride58andGitHub 8ee42a5282 Merge pull request #5090 from Citadel-Station-13/upstream-merge-34755 
[MIRROR] All color inputs use current color as default choice
 2018-01-26 15:44:23 +00:00
deathride58andGitHub 4008898f54 Merge pull request #5054 from Citadel-Station-13/upstream-merge-34829 
[MIRROR] Removes animation from photos
 2018-01-26 15:39:38 +00:00
deathride58andGitHub 3f953220af Merge pull request #5023 from Citadel-Station-13/upstream-merge-34743 
[MIRROR] Changeling clothes blood fix
 2018-01-22 20:31:28 +00:00
deathride58andGitHub 84385ee517 Merge pull request #5021 from Citadel-Station-13/upstream-merge-34734 
[MIRROR] Removes cultist space bases
 2018-01-22 20:31:05 +00:00
deathride58andGitHub f104c2c410 Merge pull request #5020 from Citadel-Station-13/upstream-merge-34704 
[MIRROR] Fixes syringe icons
 2018-01-22 20:30:52 +00:00
deathride58andGitHub 6ddc7fe320 Merge pull request #5019 from Citadel-Station-13/upstream-merge-34707 
[MIRROR] flash_carbon() runtime fix
 2018-01-22 20:30:19 +00:00
deathride58andGitHub 964281ef83 Merge pull request #5018 from Citadel-Station-13/upstream-merge-34726 
[MIRROR] Adds /area/asteroid/nearstation to GLOB.the_station_areas blacklist
 2018-01-22 20:30:02 +00:00
deathride58andGitHub 5aad92cf11 Merge pull request #4948 from Citadel-Station-13/upstream-merge-34590 
[MIRROR] Fixes slimepeople not being able to open the bodyswap menu
 2018-01-22 20:29:46 +00:00
deathride58andGitHub fadeecaf40 Merge pull request #4968 from Citadel-Station-13/upstream-merge-34667 
[MIRROR] Fixes slimes not attacking anybody
 2018-01-22 06:25:14 +00:00
deathride58andGitHub 5121a272d2 Merge pull request #5003 from Citadel-Station-13/upstream-merge-34717 
[MIRROR] Longer lasting candles.
 2018-01-22 06:24:35 +00:00
deathride58andCitadelStationBot 9e6ce24a57 removes magic numbers from the set_light var in lights (#34714) 2018-01-21 21:13:57 -06:00
deathride58andGitHub 28751ba370 Merge pull request #5001 from Citadel-Station-13/upstream-merge-34633 
[MIRROR] Refactor weather to use Z traits, assorted related cleanup
 2018-01-21 22:42:53 +00:00
deathride58andGitHub fafdad4ce9 Merge pull request #4999 from Citadel-Station-13/upstream-merge-34614 
[MIRROR] Lets check_dock be silent
 2018-01-21 22:41:33 +00:00
deathride58andGitHub 625d46fa19 Merge pull request #4998 from Citadel-Station-13/upstream-merge-34606 
[MIRROR] Config dir again except this time it works
 2018-01-21 22:41:13 +00:00
deathride58andGitHub 83135ca4e0 Merge pull request #4997 from Citadel-Station-13/upstream-merge-34567 
[MIRROR] Fixes Revs & Clockcultists being valid for mindswap
 2018-01-21 22:39:53 +00:00
deathride58andGitHub 84b02025c9 Merge branch 'master' into upstream-merge-34686 2018-01-21 22:38:47 +00:00
deathride58andGitHub 130b0f8d0d Merge pull request #4995 from Citadel-Station-13/upstream-merge-34695 
[MIRROR] Fixes brother objectives not showing in TP
 2018-01-21 22:37:52 +00:00
deathride58andGitHub 038591d11f Merge pull request #4994 from Citadel-Station-13/upstream-merge-34629 
[MIRROR] Fixes ghost show_hud runtime
 2018-01-21 22:37:34 +00:00
deathride58andGitHub 69b636f832 Merge pull request #4993 from Citadel-Station-13/upstream-merge-34692 
[MIRROR] changes min players for revs to 30 from 20
 2018-01-21 22:37:08 +00:00
deathride58andGitHub 0ce61fb375 Merge pull request #4987 from Citadel-Station-13/upstream-merge-34674 
[MIRROR] Fixes get_area_name runtime
 2018-01-21 22:36:50 +00:00
deathride58andGitHub 3e26ab5ceb Merge pull request #4990 from Citadel-Station-13/upstream-merge-34678 
[MIRROR] Adds new eldritch longsword sprite
 2018-01-21 22:36:24 +00:00
deathride58andGitHub 10e6de7421 Merge pull request #4920 from Citadel-Station-13/upstream-merge-34603 
[MIRROR] Revert "Fix config_dir usage (#34469)"
 2018-01-19 19:52:36 +00:00
deathride58andGitHub 9eada1167b Merge pull request #4965 from Citadel-Station-13/upstream-merge-34620 
[MIRROR] Corrects tile color defines
 2018-01-19 19:46:56 +00:00
deathride58andGitHub f6dbe3ea58 Merge pull request #4963 from Citadel-Station-13/upstream-merge-34504 
[MIRROR] allows servants to cancel warps more intuitively by clicking on the button again
 2018-01-19 19:45:23 +00:00
deathride58andGitHub 1a9e1b36a1 Merge pull request #4962 from Citadel-Station-13/upstream-merge-34514 
[MIRROR] You can now buckle people to target stakes
 2018-01-19 19:44:39 +00:00
deathride58andGitHub 2906e24f56 Merge pull request #4961 from Citadel-Station-13/upstream-merge-34551 
[MIRROR] fixes supply drop pods being impossible to dissassemble
 2018-01-19 19:44:18 +00:00
deathride58andGitHub 28147de16a Merge pull request #4960 from Citadel-Station-13/upstream-merge-34501 
[MIRROR] Allow mapping non-default scrubbers
 2018-01-19 19:44:00 +00:00
deathride58andGitHub 4077ec6713 Merge pull request #4957 from Citadel-Station-13/upstream-merge-34641 
[MIRROR] Fixes conveyor belt power usage.
 2018-01-19 19:43:33 +00:00
deathride58andGitHub 26bca66519 Merge pull request #4956 from Citadel-Station-13/upstream-merge-34547 
[MIRROR] Jaunt Direction Fix
 2018-01-19 19:43:14 +00:00
deathride58andGitHub 86ca34d806 Merge pull request #4953 from Citadel-Station-13/upstream-merge-34616 
[MIRROR] Adds byond versions to feedback
 2018-01-19 19:42:36 +00:00
deathride58andGitHub 2d3e79ab44 Merge pull request #4952 from Citadel-Station-13/upstream-merge-34574 
[MIRROR] Added observer verb View Gases
 2018-01-19 19:42:18 +00:00
deathride58andGitHub 8d8790f4d8 Merge pull request #4950 from Citadel-Station-13/upstream-merge-34513 
[MIRROR] Move roundid and schema check to dbcore subsystem
 2018-01-19 19:41:36 +00:00
deathride58andGitHub a71cea4832 Update subsystems.dm 2018-01-19 14:40:39 -05:00
deathride58andGitHub 78d31edc6c Merge pull request #4947 from Citadel-Station-13/upstream-merge-34557 
[MIRROR] Fixes cancelling equipment selection being equivalent to selecting "Naked"
 2018-01-19 19:39:42 +00:00
deathride58andGitHub ede18e6fec Merge pull request #4946 from Citadel-Station-13/upstream-merge-34598 
[MIRROR] Illusions now properly use the health argument of Copy_Parent
 2018-01-19 19:39:26 +00:00
deathride58andGitHub 29099c3608 Merge pull request #4945 from Citadel-Station-13/upstream-merge-34569 
[MIRROR] Fixes bananium ore sprite
 2018-01-19 19:39:07 +00:00
deathride58andGitHub c12422564f Merge pull request #4944 from Citadel-Station-13/upstream-merge-34601 
[MIRROR] TTVs are too big to fit in bags
 2018-01-19 19:38:54 +00:00
deathride58andGitHub 15d1adfea8 Update _basemap.dm 2018-01-19 14:38:12 -05:00
deathride58andGitHub b6fd362b95 Merge pull request #4942 from Citadel-Station-13/upstream-merge-34608 
[MIRROR] Fixes some dumb code in the jousting component
 2018-01-19 19:37:20 +00:00
deathride58andGitHub 947b87ec0c Merge pull request #4941 from Citadel-Station-13/upstream-merge-34609 
[MIRROR] removed an extra checktick that could cause issues in shuttles
 2018-01-19 19:37:01 +00:00
deathride58andGitHub 98cc937b40 Merge pull request #4940 from Citadel-Station-13/upstream-merge-34626 
[MIRROR] Fixes borg cell recharging runtime
 2018-01-19 19:36:47 +00:00
deathride58andGitHub 5751c601f2 Merge pull request #4939 from Citadel-Station-13/upstream-merge-34627 
[MIRROR] Fixes pie runtime
 2018-01-19 19:36:35 +00:00
deathride58andGitHub ec9f66e32e Merge pull request #4938 from Citadel-Station-13/upstream-merge-34452 
[MIRROR] Reduce the volume of the death sound on clock work mobs
 2018-01-19 19:36:18 +00:00
deathride58andGitHub ea45eb72ef Merge pull request #4937 from Citadel-Station-13/upstream-merge-34634 
[MIRROR] fix/spellcheck: Changes command error on cqc.dm
 2018-01-19 19:36:02 +00:00
deathride58andGitHub 8f358b6313 Merge pull request #4935 from Citadel-Station-13/upstream-merge-34639 
[MIRROR] Fixes autolathe power consumption
 2018-01-19 19:35:12 +00:00
deathride58andGitHub 8872f801f1 Merge pull request #4934 from Citadel-Station-13/upstream-merge-34637 
[MIRROR] Fixes empty IC syringe having 0 transfer amount
 2018-01-19 19:34:49 +00:00
deathride58andGitHub 82353abaa6 Merge pull request #4933 from Citadel-Station-13/upstream-merge-34573 
[MIRROR] Fixes the diagonal sliding
 2018-01-19 19:34:31 +00:00
deathride58andGitHub 4c5e78c7f8 Merge pull request #4932 from Citadel-Station-13/upstream-merge-34576 
[MIRROR] Removes teleport beacon from Free Golem Ship
 2018-01-19 19:34:12 +00:00
deathride58andGitHub 3514629c77 Merge pull request #4931 from Citadel-Station-13/upstream-merge-34331 
[MIRROR] Players can now see their own tracked playtime
 2018-01-19 19:33:50 +00:00
deathride58andGitHub e944dbef9c Merge pull request #4930 from Citadel-Station-13/upstream-merge-34236 
[MIRROR] Antag Panel / Check antagonists Refactor
 2018-01-19 19:33:25 +00:00
deathride58andGitHub 4aa52b8d99 Update life.dm 2018-01-19 14:32:40 -05:00
deathride58andGitHub 14be85b7d9 Merge pull request #4928 from Citadel-Station-13/upstream-merge-34512 
[MIRROR] Moves creating tag before intialization
 2018-01-19 19:32:00 +00:00
deathride58 953dc29982 Temporarily comments out footdirt proc until further notice 2018-01-19 12:02:57 -05:00
deathride58andCitadelStationBot 49a5a5cddc Fixes cancelling equipment selection being equivalent to selecting "Naked" (#34557) 
* nerfs butterfingers, throws in bonus preorder exclusive cancel button

* Update debug.dm
 2018-01-19 09:16:22 -06:00
deathride58andGitHub 19fa1066d9 Update AI_modules.dm 2018-01-19 08:48:40 -05:00
deathride58andGitHub 844a80dba6 Update title.dm 2018-01-19 08:48:09 -05:00
deathride58andGitHub 7b5b354e9d Update ticker.dm 2018-01-19 08:47:49 -05:00
deathride58andGitHub cf538efeb7 Update credits.dm 2018-01-19 08:47:27 -05:00
deathride58andCitadelStationBot 757dfbbdc5 Ports Aurora's floor tile color turf decals (For mappers) (#34492) 
* ports Aurora's floor tile color decals

* replaces aurora's decals with new ones that actually have detail, renames turf_decal/corner to turf_decal/tile

* corner > tile decal
 2018-01-18 21:28:14 -06:00
deathride58andGitHub c545dc2f79 Merge pull request #4919 from Citadel-Station-13/upstream-merge-34563 
[MIRROR] Regens icons on clean_act if item is loc'd on a mob
 2018-01-19 00:33:07 +00:00
deathride58andGitHub d54dae8ddf Merge pull request #4918 from Citadel-Station-13/upstream-merge-34552 
[MIRROR] All crew can purify the Blood Bastard Sword (again)
 2018-01-19 00:32:50 +00:00
deathride58andGitHub ca9ce2058e Merge pull request #4917 from Citadel-Station-13/upstream-merge-34529 
[MIRROR] changes the null rod's description to reflect its use against clockwork cults
 2018-01-19 00:32:26 +00:00
deathride58andGitHub 61ccb255c4 Merge pull request #4915 from Citadel-Station-13/upstream-merge-34438 
[MIRROR] Mass hallucinations now gives the same hallucination to everyone
 2018-01-19 00:32:11 +00:00
deathride58andGitHub b0f8c35379 Merge pull request #4914 from Citadel-Station-13/upstream-merge-34423 
[MIRROR] Adds useful sec officer tips
 2018-01-19 00:31:43 +00:00
deathride58andGitHub 6f312b9d5c Merge pull request #4912 from Citadel-Station-13/upstream-merge-34553 
[MIRROR] Fixes being able to place abstract items in fridges & chem dispensers
 2018-01-18 23:06:41 +00:00
deathride58andGitHub 553ccd5597 Merge pull request #4911 from Citadel-Station-13/upstream-merge-34558 
[MIRROR] Log PDA messages sent by the message monitor console
 2018-01-18 23:06:19 +00:00
deathride58andGitHub b93df3a5b3 Merge pull request #4910 from Citadel-Station-13/upstream-merge-34561 
[MIRROR] Spellcheck: Fixed a typo on holy_weapons.dm
 2018-01-18 23:05:52 +00:00
deathride58andGitHub a1aa60188c Merge pull request #4907 from Vivinet/Potat-OS 
Craftable Intellicard Alt: Potat-OS
 2018-01-18 23:05:21 +00:00
deathride58andGitHub 3d0d1bd06a Merge pull request #4097 from deathride58/theprthatbulliesjanitormains 
[READY] Makes walking on tiles slowly make them dirty, similar to Baystation, and adds footstep sounds (Featuring sounds from CEV Eris!)
 2018-01-18 06:28:04 +00:00
deathride58andGitHub e22b022e98 Merge pull request #4902 from Vivinet/Vivinet 
Mining Droid + Borg Tank Tread Movement
 2018-01-18 04:59:24 +00:00
deathride58andGitHub 9bf498c763 Merge pull request #4903 from Citadel-Station-13/upstream-merge-34291 
[MIRROR] Removes sulpheric acid requirement from most computer boards
 2018-01-18 04:59:08 +00:00
deathride58andGitHub 8c743141da Merge pull request #4721 from deathride58/genitalexamine 
Exposed genitals will now add details onto examine text
 2018-01-18 04:56:50 +00:00
deathride58andGitHub f92f1f0390 Merge pull request #4839 from Citadel-Station-13/LetterJay-patch-1 
Shock collars
 2018-01-18 04:56:18 +00:00
deathride58andGitHub 35635b3cf0 Merge pull request #4892 from theTiji0/bananaSpider 
Banana spider
 2018-01-18 04:55:15 +00:00