shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,252 Commits 5 Branches 0 Tags
7126b6120521f59f1c467f962a4159f37c852878
Commit Graph
4903 Commits
Author SHA1 Message Date
CitadelStationBotandPoojawa 7126b61205 [MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327) 
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag

* really? Like, a dozen fucking map conflicts. this map was fucked entirely
 2018-02-06 19:06:31 -06:00
CitadelStationBotandPoojawa b6c4bd6e01 [MIRROR] Fixes bloodpack sprite issues (#5333) 
* Fixes bloodpack sprite issues

* Update packs.dm

* fuck this godamn map
 2018-02-06 18:24:51 -06:00
deathride58andGitHub 380556dde4 Merge pull request #5330 from Citadel-Station-13/upstream-merge-35156 
[MIRROR] Slaughter demon, Morph, ERT / Deathsquad antag datums.
 2018-02-06 17:54:05 +00:00
PoojawaandGitHub 1d4e0d3511 Oops, copy paste fail 2018-02-06 09:56:36 -06:00
PoojawaandGitHub 1bf0cdac64 Update slaughterevent.dm 2018-02-06 09:56:10 -06:00
PoojawaandGitHub 35dcf5dce1 Update slaughter.dm 2018-02-06 09:50:12 -06:00
PoojawaandGitHub 79cb10f8ec Update morph.dm 2018-02-06 09:49:46 -06:00
LetterJayandGitHub 469abfd599 Update vent_clog.dm 2018-02-06 02:16:25 -06:00
PoojawaandGitHub 1cea674509 Update antag_spawner.dm 2018-02-05 21:35:15 -06:00
deathride58andGitHub 156fa1da1a Update antag_spawner.dm 2018-02-05 21:47:53 -05:00
deathride58andGitHub 5357d4bd69 Merge pull request #5328 from Citadel-Station-13/upstream-merge-35322 
[MIRROR] Adds missing wrapper for abductor roundend report.
 2018-02-06 02:46:05 +00:00
deathride58andGitHub c9f7e7f14a Merge pull request #5321 from Citadel-Station-13/upstream-merge-35152 
[MIRROR] Rearranges mining vendor items and code, adds conscription kit
 2018-02-06 02:43:57 +00:00
deathride58andGitHub 024347aff2 Merge pull request #5320 from Citadel-Station-13/upstream-merge-35282 
[MIRROR] Eggs from the abductor egg gland now have a random reagent instead of acid
 2018-02-06 02:43:35 +00:00
AnturKandCitadelStationBot f9666ab6c9 Slaughter demon, Morph, ERT / Deathsquad antag datums. 2018-02-05 17:00:09 -06:00
vuonojenmustaturskaandCitadelStationBot ef986731ab Merge pull request #35322 from AnturK/missing-wrapper 
Adds missing wrapper for abductor roundend report.
 2018-02-05 15:47:36 -06:00
vuonojenmustaturskaandCitadelStationBot 33f83e3274 Merge pull request #35152 from 81Denton/mining-vendor-conscript 
Rearranges mining vendor items and code, adds conscription kit
 2018-02-05 09:38:46 -06:00
XDTMandCitadelStationBot bdd791f307 Eggs from the abductor egg gland now have a random reagent instead of acid 2018-02-05 09:14:08 -06:00
MMMiraclesandCitadelStationBot 4c6bdf1a9e Snowdin 2.0 2018-02-05 09:10:40 -06:00
CitadelStationBotandPoojawa c4107ba117 [MIRROR] Fixes Luminous Slime spam (#5286) 
* Fixes Luminous Slime spam

* Update jellypeople.dm
 2018-02-05 04:56:39 -06:00
CitadelStationBotandPoojawa 98d18ee7e3 [MIRROR] Removes tripai landmark (#5280) 
* Removes tripai landmark

* Update landmarks.dm
 2018-02-05 04:44:31 -06:00
CitadelStationBotandPoojawa e16db54c67 [MIRROR] Bartender Drink Sliding: Intrinsic to Extrinsic (#5297) 
* Bartender Drink Sliding: Intrinsic to Extrinsic

* Update packs.dm
 2018-02-05 04:42:13 -06:00
CitadelStationBotandPoojawa 5c16755e58 [MIRROR] Fixes Vape Pen (e-cig) reagent spam (#5296) 
* Fixes Vape Pen (e-cig) reagent spam

* Update cigs_lighters.dm
 2018-02-05 04:33:36 -06:00
CitadelStationBotandPoojawa 9e229691cc Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304) 2018-02-05 04:23:09 -06:00
PoojawaandGitHub 03b33075e5 Mentor System (#5235) 
* reworked mentor system, again. wew

* Update admin.txt

* uhg
 2018-02-05 04:09:56 -06:00
CitadelStationBotandPoojawa 6db855ad4c [MIRROR] Doubles cog power generation, and allows them to generate power at half efficiency in uncharged APCs (#5292) 
* Doubles cog power generation, and allows them to generate power at half efficiency in uncharged APCs

* Update integration_cog.dm
 2018-02-05 03:28:24 -06:00
CitadelStationBotandPoojawa fa38b8a2f3 [MIRROR] Readds the syndicate comms officer (#5290) 
* Readds the syndicate comms officer

* Update listeningstation.dmm
 2018-02-05 03:19:54 -06:00
CitadelStationBotandPoojawa 43ee34838f [MIRROR] Adds pineapples to botany, and Hawaiian pizza (#5260) 
* Adds pineapples to botany, and Hawaiian pizza

* Update packs.dm
 2018-02-05 03:00:22 -06:00
CitadelStationBotandPoojawa b0fb541b8c [MIRROR] Adds some customization to ruin loader (#5289) 
* Adds some customization to ruin loader

* Update maps.dm
 2018-02-05 02:33:20 -06:00
CitadelStationBotandPoojawa afb0b08837 [MIRROR] Fixes servant cyborgs with the Standard module not having Abscond (#5266) 
* Fixes servant cyborgs with the Standard module not having Abscond

* Update clockwork_slab.dm

* Update clockwork_slab.dm
 2018-02-05 01:39:36 -06:00
CitadelStationBotandPoojawa 88fdac3579 [MIRROR] Removes ketrazine (#5264) 
* Removes ketrazine

* Update medicine_reagents.dm
 2018-02-05 01:30:42 -06:00
CitadelStationBotandPoojawa 584fc7151b [MIRROR] makes reebe more than steam vent + brass skewer + pressure sensor + matrix simulator 2k18 by adding adjacency checks and some other things (#5256) 
* makes reebe more than steam vent + brass skewer + pressure sensor + matrix simulator 2k18 by adding adjacency checks and some other things (#34888)

* traps patch

* flags!

* makes reebe more than steam vent + brass skewer + pressure sensor + matrix simulator 2k18 by adding adjacency checks and some other things
 2018-02-05 00:57:31 -06:00
CitadelStationBotandPoojawa 417cd16239 [MIRROR] Fixes white "eye" pixels appearing on races with custom eyes on their sprite (#5255) 
* Merge pull request #35185 from Xhuis/eyesontheinsideofourbrains

Fixes white "eye" pixels appearing on races with custom eyes on their sprite

* Fixes white "eye" pixels appearing on races with custom eyes on their sprite
 2018-02-05 00:57:18 -06:00
CitadelStationBotandPoojawa fb03783346 [MIRROR] Fixes changelings retaining fake brains on de-changelining (#5248) 
* Merge pull request #34872 from AnturK/theresabraininymyhead

Fixes changelings retaining fake brains on de-changelining

* Fixes changelings retaining fake brains on de-changelining
 2018-02-05 00:56:51 -06:00
CitadelStationBotandPoojawa de1d277b65 [MIRROR] Buffs Clogged Vents (#5301) 
* Buffs Clogged Vents (#34949)

* Buffs Clogged Vents

🆑 Iamgoofball
feature: Clogged Vents now has some teeth
/🆑

This was the only part of GoofEvents players liked

* Update effects_foam.dm

* Update vent_clog.dm

* Update vent_clog.dm

* Update vent_clog.dm

* Update vent_clog.dm

* Update vent_clog.dm

* Buffs Clogged Vents
 2018-02-05 00:52:06 -06:00
CitadelStationBotandPoojawa 18932a5d31 [MIRROR] [s] Fixes clogged vents delamming the supermatter (#5303) 
* [s] Fixes clogged vents delamming the supermatter (#35300)

wow forgot to commit thiss to the PR lmao

* [s] Fixes clogged vents delamming the supermatter
 2018-02-05 00:51:34 -06:00
CitadelStationBotandPoojawa cae09efd79 [MIRROR] Romerol works on dead people (#5305) 
* Romerol works on dead people (#34870)

🆑 coiax
balance: Romerol is now effective on dead bodies, not just ones that are
still alive.
/🆑

Why? Because it seems silly that a zombie virus requires someone to be
alive, and zombie claws work on dead bodies.

* Romerol works on dead people
 2018-02-05 00:49:53 -06:00
CitadelStationBotandPoojawa 15be2b9579 [MIRROR] Intelligence potions won't override previously known mob languages (#5309) 
* Intelligence potions won't override previously known mob languages

* Intelligence potions won't override previously known mob languages
 2018-02-05 00:49:34 -06:00
CitadelStationBotandPoojawa fcff80df09 [MIRROR] Fix research investigate logs (#5310) 
* Merge pull request #35283 from AutomaticFrenzy/patch/research-logs

Fix research investigate logs

* Fix research investigate logs
 2018-02-05 00:49:17 -06:00
CitadelStationBotandPoojawa b25bcbbfab [MIRROR] Fixes power cell name and makes borgs use a standard high capacity cell. (#5315) 
* Fixes power cell name and makes borgs use a standard high capacity cell. (#35265)

* Fixes name for upgraded power cell

* Harmonizes battery for cyborgs

* Remove duplicate battery code

* Fixes power cell name and makes borgs use a standard high capacity cell.
 2018-02-05 00:47:39 -06:00
CitadelStationBotandPoojawa 330a6ca0af Added transit tubes to the RPD (#5300) 2018-02-05 00:46:34 -06:00
CitadelStationBotandPoojawa 7b7674d0ef [MIRROR] Fixes ancient goliathes tentacle attack continuing after death (#5285) 
* Fixes ancient goliathes tentacle attack (#35243)

* Fixes ancient goliathes tentacle attack continuing after death
 2018-02-04 23:18:51 -06:00
CitadelStationBotandPoojawa 23085154ab [MIRROR] Fixes animal spawners spawning mobs after death (#5284) 
* Fixes ancient goliathes (#35242)

* Fixes animal spawners spawning mobs after death
 2018-02-04 23:18:34 -06:00
CitadelStationBotandPoojawa cc2d5bfc07 [MIRROR] Fixes attackby in expressconsole.dm, moves bluespace pod upgrade further down the line in techwebs (#5283) 
* Fixes attackby in expressconsole.dm, moves bluespace pod upgrade further down the line in techwebs (#35249)

* yaga

* node change

* okay cobby

* Fixes attackby in expressconsole.dm, moves bluespace pod upgrade further down the line in techwebs
 2018-02-04 23:18:18 -06:00
CitadelStationBotandPoojawa cb9c2b6124 [MIRROR] battery rig fix (#5282) 
* battery rig fix (#35254)

* fix

* oops

* Auto stash before rebase of "tgstation/master"

* remove double notification

* battery rig fix
 2018-02-04 23:17:54 -06:00
CitadelStationBotandPoojawa caadbaf887 [MIRROR] Fixes mecha grav catapult not being available in techwebs (#5281) 
* Merge pull request #35248 from KorPhaeron/gravity2

Fixes mecha grav catapult not being available in techwebs

* Fixes mecha grav catapult not being available in techwebs
 2018-02-04 23:17:16 -06:00
CitadelStationBotandPoojawa 78ca971767 [MIRROR] Adds sprites for conveyor belt constructs (#5276) 
* Adds sprites for conveyor belt constructs (#35252)

* lemme just convey this thought

* slight sprite update

* asdf

* Adds sprites for conveyor belt constructs
 2018-02-04 23:12:47 -06:00
CitadelStationBotandPoojawa 2d9f549af3 [MIRROR] Raises the cid check disconnect time out (#5272) 
* raises the cid check disconnect time out (#35244)

Disconnects from deleting the client are immediate, where are other commands are queued to some degree or another, browse is the worst one of all since it has to queue behind after connect resource sends as well as the asset cache or browse_rsc calls.

I'm finding hints that clients on lagger connections are getting disconnected before getting the reconnect command, and I was able to reproduce this myself on a cell phone connection while connecting to terry

* Raises the cid check disconnect time out
 2018-02-04 23:05:22 -06:00
deathride58andPoojawa 65d507f31f Darkens chatbox a lil to go along with the UI's dark theme (#5250) 2018-02-04 22:27:38 -06:00
CitadelStationBotandPoojawa 71f5bee4c4 [MIRROR] Future proofs Easter calculations (#5247) 
* Merge pull request #35079 from tortellinitony/easter

Future proofs Easter calculations

* Future proofs Easter calculations
 2018-02-04 22:22:56 -06:00
CitadelStationBotandPoojawa 7ddf4addd0 [MIRROR] Fixes spelling error in explorer_gear.dm (#5239) 
* Spelling FIX

* Fixes spelling error in explorer_gear.dm
 2018-02-04 22:19:36 -06:00