shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,396 Commits 5 Branches 0 Tags
5f759c7c3f9c3b84f949d55792714aecfa144b36
Commit Graph
5396 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJayandGitHub 5f759c7c3f Merge pull request #2858 from Citadel-Station-13/upstream-merge-30859 
[MIRROR] Fixes safes not having adjacency checks
 2017-09-19 12:19:59 -04:00
CitadelStationBot 2f308fc2f7 Automatic changelog generation for PR #2817 [ci skip] 2017-09-19 11:15:03 -05:00
LetterJayandGitHub e410b452ea Merge pull request #2817 from Michiyamenotehifunana/master 
Adds Anti Tank pistols
 2017-09-19 12:15:01 -04:00
CitadelStationBot 63dc45082e Fixes safes not having adjacency checks 2017-09-19 10:56:51 -05:00
kevinz000andCitadelStationBot 7c0e17236d Fixes safes not having adjacency checks (#30859) 
* Update safe.dm

* Update safe.dm
 2017-09-19 10:56:51 -05:00
CitadelStationBotandPoojawa fd2e1c896f [MIRROR] Fixes incorp move runtimes on border movement. (#2774) 
* Fixes incorp move runtimes on border movement.

* Update mob_movement.dm

* Update mob_movement.dm
 2017-09-19 07:00:54 -05:00
CitadelStationBotandPoojawa ecce4cf138 [MIRROR] New DCS signals (#2741) 
* New DCS signals

* Update atoms.dm

* actually ports comsigs
 2017-09-19 07:00:08 -05:00
CitadelStationBot 1352eefa3a Automatic changelog generation for PR #2705 [ci skip] 2017-09-19 06:37:57 -05:00
CitadelStationBotandPoojawa 628a2442e2 [MIRROR] Slightly remaps and adds more supplies to the animal hospital ruin (#2705) 
* Merge pull request #30505 from Xhuis/vet_remap

Slightly remaps and adds more supplies to the animal hospital ruin

* Slightly remaps and adds more supplies to the animal hospital ruin
 2017-09-19 06:37:56 -05:00
CitadelStationBotandPoojawa 3afe490be3 [MIRROR] Fixes bees attacking apiaries (#2772) 
* Fixes bees attacking apiaries

* Update bees.dm
 2017-09-19 06:37:30 -05:00
CitadelStationBotandPoojawa 170f5d7a5e [MIRROR] Log file for PDA messages (#2848) 
* log file for pda messaegs (#30827)

* Log file for PDA messages
 2017-09-19 06:34:53 -05:00
CitadelStationBotandPoojawa e1aa96ad64 [MIRROR] Remove unused check_pressure proc (#2852) 
* Remove unused check_pressure proc (#30853)

* Remove unused check_pressure proc
 2017-09-19 06:24:47 -05:00
CitadelStationBotandPoojawa 9c9020ec32 [MIRROR] Removes dead testing code (#2854) 
* Merge pull request #30860 from ninjanomnom/quickfix

Removes dead testing code

* Removes dead testing code
 2017-09-19 06:24:12 -05:00
Michiyamenotehifunana 1f84944dee Anti Tank Pistol Improvements and Implementation 
Fixes the issues with the ATP, modifies its sprite slightly, and adds it to the nukeops uplink list.
 2017-09-18 23:11:14 +08:00
CitadelStationBot 32ec532c1c Automatic changelog generation for PR #2840 [ci skip] 2017-09-18 07:35:02 -05:00
LetterJayandGitHub 19309d76d0 Merge pull request #2840 from Citadel-Station-13/upstream-merge-30344 
[MIRROR] Traitorbro gamemode
 2017-09-18 08:35:00 -04:00
CitadelStationBotandPoojawa 1edd7b82d1 [MIRROR] Minor weather code split/refactor (#2837) 
* Minor weather code split/refactor

* Delete weather_types.dm

* Update radiation_storm.dm
 2017-09-18 01:46:41 -05:00
CitadelStationBotandPoojawa d4a577014a [MIRROR] Fixes esaw icon (#2831) 
* Fixes esaw icon

* Update energy.dm
 2017-09-18 01:46:20 -05:00
CitadelStationBot 50bd67ad9d Automatic changelog generation for PR #2813 [ci skip] 2017-09-18 01:46:01 -05:00
CitadelStationBotandPoojawa d8a1fc936e [MIRROR] Stops AIs from taking actions while depowered (#2813) 
* Stops AIs from taking actions while depowered

* Update ai.dm
 2017-09-18 01:45:59 -05:00
CitadelStationBotandPoojawa 4bc6e9d522 [MIRROR] Cleaned up some decimal values. (#2797) 
* Cleaned up some decimal values.

* Update gas_mixture.dm

* Update color.dm

* Update medsci.dm
 2017-09-18 01:45:39 -05:00
CitadelStationBotandPoojawa 2d7ead37d5 [MIRROR] Adds a new buckknife sprite! (#2793) 
* Merge pull request #30680 from Armhulen/help-a-friend-out

Adds a new buckknife sprite!

* Adds a new buckknife sprite!

* update kitchen.dmi
 2017-09-18 01:45:25 -05:00
CitadelStationBot 9051af7790 Automatic changelog generation for PR #2771 [ci skip] 2017-09-17 23:07:56 -05:00
CitadelStationBotandPoojawa f778b3061c [MIRROR] Gives Deltastation's and Metastation's armory one more riot shotty (#2771) 
* share the love

* Gives Deltastation's and Metastation's armory one more riot shotty
 2017-09-17 23:07:55 -05:00
CitadelStationBot ab72f170d9 Automatic changelog generation for PR #2768 [ci skip] 2017-09-17 23:07:07 -05:00
CitadelStationBotandPoojawa 83ec9b6d26 [MIRROR] Cleans up showcase & plaque varedits, updated loyalty implant references (#2768) 
* Cleans up showcase & plaque varedits, updated loyalty implant references (#30698)

* Cleans up showcase varedits

* drop_location for oldpods

* Plaques + more loyalty implant references

* Cleans up showcase & plaque varedits, updated loyalty implant references
 2017-09-17 23:07:05 -05:00
PoojawaandGitHub 7bfa8b1a9a Changes Hulk allowed species to fly from 'oomie (#2819) 
Changes Hulk allowed species and fixes SE issues
 2017-09-17 23:06:23 -05:00
CitadelStationBot 9adc33f36b Automatic changelog generation for PR #2825 [ci skip] 2017-09-17 22:59:35 -05:00
CitadelStationBotandPoojawa 680e9e9697 [MIRROR] Quick pAI software buying tweak (#2825) 
* Added the thing that Cruix wanted

* Quick pAI software buying tweak

* Update software.dm
 2017-09-17 22:59:33 -05:00
CitadelStationBotandPoojawa 7299854f8b [MIRROR] Puts the computer circuit board back in nullspace where it supposedly belongs (#2810) 
* Puts the computer circuit board back in nullspace where it supposedly belongs

* Update _computer.dm
 2017-09-17 22:55:04 -05:00
CitadelStationBotandPoojawa e2e85e9294 [MIRROR] Window Spawner Refactor (#2815) 
* Window spawner refactor (#30747)

* Window Spawner Refactor
 2017-09-17 22:42:22 -05:00
CitadelStationBotandPoojawa 15c321108f [MIRROR] Update ISSUE_TEMPLATE and PULL_REQUEST_TEMPLATE (#2826) 
* Update ISSUE_TEMPLATE and PULL_REQUEST_TEMPLATE (#30799)

* Improve .github/ISSUE_TEMPLATE.md

* Improve .github/PULL_REQUEST_TEMPLATE.md

* Short message about Show Server Revision

* Re-add the admin note to ISSUE_TEMPLATE

* [Note] -> [Directions]

* Update ISSUE_TEMPLATE and PULL_REQUEST_TEMPLATE
 2017-09-17 22:41:55 -05:00
PoojawaandGitHub a9e3deb51a Update hud.dm 2017-09-17 22:38:31 -05:00
PoojawaandGitHub d5c012d431 Update role_preferences.dm 2017-09-17 22:38:03 -05:00
PoojawaandGitHub a4310ec6a6 Update atom_hud.dm 2017-09-17 22:37:44 -05:00
CitadelStationBotandPoojawa 0187068b6a [MIRROR] Omega fixes (#2816) 
* Omega fixes (#30779)

* Omega fixes
 2017-09-17 22:36:49 -05:00
CitadelStationBotandPoojawa 201cb984c8 [MIRROR] Fix ingredient box icon (again) (#2823) 
* Fix ingredient boxes

* Fix ingredient box icon (again)
 2017-09-17 22:36:21 -05:00
CitadelStationBotandPoojawa 4dd0dc9d66 [MIRROR] Various grammar fixes (#2842) 
* Various grammar fixes

* Update mecha_parts.dm

* Update crates.dm

* Update ghost_role_spawners.dm

* Update paper_premade.dm

* Update oldstation.dm
 2017-09-17 22:35:51 -05:00
CitadelStationBotandPoojawa b13f090fe9 [MIRROR] Adds Lavaland items to weapon exports for cargo (#2836) 
* Adds Lavaland items to weapon exports for cargo (#30403)

They're expensive, but those mobs are quite difficult to kill

* Adds Lavaland items to weapon exports for cargo
 2017-09-17 22:32:53 -05:00
CitadelStationBotandPoojawa 99e0463261 [MIRROR] Fixes bluespace golem teleport icon (#2834) 
* Fixes bluespace golem teleport icon

* Fixes bluespace golem teleport icon
 2017-09-17 22:31:55 -05:00
CitadelStationBotandPoojawa c8b153ee71 [MIRROR] Varedit cleanup mk4 (#2833) 
* Varedit cleanup mk4 (#30794)

* Cleans up and corrects a bunch of varedits

* Plant varedits

* More layers

* Adjusted plant name/description

* Varedit cleanup mk4
 2017-09-17 22:31:30 -05:00
CitadelStationBotandPoojawa b0b3e00c51 [MIRROR] Cleans up some chemmaster varedits (#2832) 
* Cleans up some chemmaster varedits (#30787)

* Cleans up some chemmaster varedits

* Moved the chemmaster on Omega.

* Cleans up some chemmaster varedits
 2017-09-17 22:27:17 -05:00
CitadelStationBotandPoojawa 76085457d6 [MIRROR] Fix maple shotgun icon_state (#2829) 
* Fix maple shotgun icon_state (#30796)

* Fix maple shotgun icon_state
 2017-09-17 22:26:50 -05:00
CitadelStationBot 0c1cfd8382 Automatic changelog generation for PR #2827 [ci skip] 2017-09-17 22:26:00 -05:00
CitadelStationBotandPoojawa 8846708727 [MIRROR] Fixes cyborg airlock interaction (#2827) 
* Fixes cyborg airlock interaction (#30809)

* changes the sheet check to respect cyborgs

* Uses the proc instead of a hack that we wound need to fix again

* I can code totaly, yeah, sober...

* I cant posibly be drunk yet i only GOT the wine a minute ago

* Fixes cyborg airlock interaction
 2017-09-17 22:25:59 -05:00
CitadelStationBotandPoojawa 9284bdd205 [MIRROR] Admins in chat are notified if an ahelp is answered in game (#2828) 
* Admins in chat are notified if an ahelp is answered in game (#30638)

* Admins in chat are notified if an ahelp is answered in game

* Further sanity

* Admins in chat are notified if an ahelp is answered in game
 2017-09-17 22:25:43 -05:00
CitadelStationBotandPoojawa 656b9c2810 [MIRROR] Fixes remaining dummy delete runtime. (#2824) 
* Fixes remaining dummy delete runtime.

* Fixes remaining dummy delete runtime.
 2017-09-17 22:23:43 -05:00
CitadelStationBot 4233b2c74d Automatic changelog generation for PR #2821 [ci skip] 2017-09-17 22:23:09 -05:00
CitadelStationBotandPoojawa b1ba49f37e [MIRROR] Blobbernauts are healed quicker by cores and nodes (#2821) 
* Blobbernauts are healed quicker by cores and nodes (#30527)

* Blobbernauts are healed quicker by cores and nodes

i hate sitting for 3-5 minutes waiting to heal as a naut

* no you can't heal without a factory

* Update blob_mobs.dm

* Update blob_mobs.dm

* Update blob_mobs.dm

* Update blob_mobs.dm

* Update blob_mobs.dm

* Update blob_mobs.dm

* Update blob_mobs.dm

* Update blob_mobs.dm

* Update blob_mobs.dm

* Blobbernauts are healed quicker by cores and nodes
 2017-09-17 22:23:08 -05:00
CitadelStationBotandPoojawa d0c9f79a37 [MIRROR] Makes building with plasma glass a thing. (#2820) 
* Makes building with plasma glass a thing. (#30800)

* Makes building with plasma glass a thing.

* Updated grille.dm

* Makes building with plasma glass a thing.
 2017-09-17 22:22:50 -05:00