Commit Graph

4889 Commits

Author SHA1 Message Date
Poojawa
79cb10f8ec Update morph.dm 2018-02-06 09:49:46 -06:00
Poojawa
1cea674509 Update antag_spawner.dm 2018-02-05 21:35:15 -06:00
deathride58
156fa1da1a Update antag_spawner.dm 2018-02-05 21:47:53 -05:00
AnturK
f9666ab6c9 Slaughter demon, Morph, ERT / Deathsquad antag datums. 2018-02-05 17:00:09 -06:00
CitadelStationBot
c4107ba117 [MIRROR] Fixes Luminous Slime spam (#5286)
* Fixes Luminous Slime spam

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

* Update landmarks.dm
2018-02-05 04:44:31 -06:00
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
9e229691cc Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304) 2018-02-05 04:23:09 -06:00
Poojawa
03b33075e5 Mentor System (#5235)
* reworked mentor system, again. wew

* Update admin.txt

* uhg
2018-02-05 04:09:56 -06:00
CitadelStationBot
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
CitadelStationBot
fa38b8a2f3 [MIRROR] Readds the syndicate comms officer (#5290)
* Readds the syndicate comms officer

* Update listeningstation.dmm
2018-02-05 03:19:54 -06:00
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
88fdac3579 [MIRROR] Removes ketrazine (#5264)
* Removes ketrazine

* Update medicine_reagents.dm
2018-02-05 01:30:42 -06:00
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
330a6ca0af Added transit tubes to the RPD (#5300) 2018-02-05 00:46:34 -06:00
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
deathride58
65d507f31f Darkens chatbox a lil to go along with the UI's dark theme (#5250) 2018-02-04 22:27:38 -06:00
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
1d11603d52 [MIRROR] Fixes a naughty dot (#5237)
* Merge pull request #35150 from DaxDupont/myanusisbleeding

Fixes a naughty dot

* Fixes a naughty dot
2018-02-04 22:11:48 -06:00
CitadelStationBot
e2ce020a62 [MIRROR] Fixes a couple of typos and ports one New to Initialize (#5233)
* Merge pull request #35145 from vuonojenmustaturska/acidtypos

Fixes a couple of typos and ports one New to Initialize

* Fixes a couple of typos and ports one New to Initialize
2018-02-04 22:11:07 -06:00
CitadelStationBot
ee0245c79f [MIRROR] Tomatoes and other foods found to have girl parts; removed from vegetable piles (#5226)
* Merge pull request #35122 from CosmicScientist/you-say-tomaetoe-i-say-tomato-youre-wrong

Tomatoes and other foods found to have girl parts; removed from vegetable piles

* Tomatoes and other foods found to have girl parts; removed from vegetable piles
2018-02-04 22:07:17 -06:00
CitadelStationBot
dc06d0373c [MIRROR] Fixes lightfixture placement issue (#5225)
* Fixes lightfixture placement issue

* Fixes lightfixture placement issue
2018-02-04 22:06:22 -06:00
deathride58
142e96a2dd [READY] Adds night shifts (#4281)
* initial commit - adds night shifts

* fixes lighting not updating when nightshift is triggered and fixes compiling issues

* makes red alert override nightshift

* Update lighting.dm

* adds announcements for nightshift changes

* fixes nightshift flip-flopping during the night, adjusts night message a little, moves from minor_announce to priority_announce

* Update cit_nightshift.dm

* fixes compiling errors
2018-02-04 21:28:41 -06:00
Poojawa
467df149fd I swear every player on this server is a complete idiot
God forbid anyone has anything remotely fun.
2018-02-04 08:16:54 -06:00
Poojawa
ed72d175c8 actually no, let's just do this 2018-02-03 10:34:42 -06:00
Poojawa
1bc69ec9b2 Vore alterations 2018-02-03 10:28:27 -06:00
Poojawa
7294424397 Makes Stargazers admin only 2018-02-03 09:03:16 -06:00
Poojawa
9755eb28ee compile fixes 2018-02-03 06:32:16 -06:00
Poojawa
059b34050b Removes Stargazers, far too liable to be abused by powergamers 2018-02-03 06:24:27 -06:00
Poojawa
e0703fcecc Removes Fun 2018-02-01 21:39:30 -06:00
deathride58
408e0cce5f Fixes genital previews (#5251) 2018-02-01 12:58:44 -06:00
Poojawa
ae888f1dff fix problems with one weird trick
if I'm not using something, I shouldn't be using it.
2018-02-01 08:56:01 -06:00