Commit Graph

264 Commits

Author SHA1 Message Date
AnturK
3e12e1b2f6 Some antag fixes. (#35690)
* Removes misleading comment

* Fixes devil ascension visible in lobby

* Fixes nuke op reinforcements.

* ADVANCED COPYPASTE

* Missed this one.
2018-02-16 10:35:55 -06:00
81Denton
42979ee771 dr. satellite I'm EMAG (#35662) 2018-02-16 00:39:51 -06:00
deathride58
d7c06fec6f Merge pull request #5505 from Citadel-Station-13/upstream-merge-35342
[MIRROR] Adds Cryostatis Shotgun Darts
2018-02-16 01:29:14 +00:00
deathride58
efa1f99f9d Merge pull request #5495 from Citadel-Station-13/upstream-merge-35548
[MIRROR] Slime Radio Potion
2018-02-16 01:12:07 +00:00
MMMiracles
bd9ad82bbf Adds Cryostatis Shotgun Darts (#35342)
* adds cryostatis shotgun darts, because shooting tiny water+potassium bombs into people is funny

* lowers amount from 15 to 10

* Update ammo_casings.dm
2018-02-15 14:25:05 -06:00
KorPhaeron
0ed0abbd4c Slime Radio Potion (#35548)
* Slime Radio Potion

* Deletes inaccurate comment
2018-02-15 10:38:59 -06:00
vuonojenmustaturska
e70194f329 Merge pull request #35561 from ShizCalev/rndconsole-runtime
Fixes rnd console runtimes
2018-02-15 10:38:49 -06:00
Jack Edge
dffee58459 Transference potions rename the mob to just your name
So instead of "Braxton Cherry as parrot", it'll just be "Braxton Cherry"
now. Polymorphing keeps your name, this has always bugged me as ugly and
unneeded.
2018-02-13 18:09:51 -06:00
Dax Dupont
a0feb17597 Cell chargers are now buildable and (upgradable!) machines. 2018-02-12 11:15:52 -06:00
vuonojenmustaturska
3d5e49f06d Merge pull request #35549 from KorPhaeron/golem
Removes old golem items
2018-02-12 09:09:14 -06:00
CitadelStationBot
9025a3df29 Merge pull request #5418 from Citadel-Station-13/upstream-merge-35502
[MIRROR] pet carriers can be actually made
2018-02-11 09:43:17 -06:00
CitadelStationBot
f3569cf023 Merge pull request #5415 from Citadel-Station-13/upstream-merge-35235
[MIRROR] Mining sentience upgrade grants minebots a radio and ID
2018-02-11 07:38:14 -06:00
CitadelStationBot
088ad78f95 Merge pull request #5414 from Citadel-Station-13/upstream-merge-35376
[MIRROR] Buildable Shuttle/Plastitanium Windows
2018-02-11 07:38:06 -06:00
Leo
b55fd38680 Merge pull request #35502 from Tlaltecuhtli/patch-1
pet carriers can be actually made
2018-02-11 07:34:51 -06:00
KorPhaeron
e64a42c248 Mining sentience upgrade grants minebots a radio and ID (#35235)
* Minebots get mining radio+ID card

* Updates radio implant paths
2018-02-11 05:13:46 -06:00
uraniummeltdown
e3ec8a648a Buildable Shuttle/Plastitanium Windows (#35376)
* use titanium/plastitanium on unanchored reinforced fulltile window to make shuttle/plastitanium windows

* updates titanium/plastitanium sprites, adds titanium glass and plastitanium glass, fixes material amount in mineral glass
2018-02-11 05:13:37 -06:00
Mokiros
cdcb5fc72f Buildable and upgradable All-In-One Grinder (#35451)
Circuit is in "Biological Processing" techweb node
2018-02-11 05:12:23 -06:00
Jordan Brown
fd479e7128 Replaces some var values with defines 2018-02-10 11:11:09 -06:00
deathride58
a46fdf8750 Merge pull request #5390 from Citadel-Station-13/upstream-merge-35463
[MIRROR] Cell blueprints now use the /empty variants
2018-02-10 04:00:08 +00:00
Jordan Brown
38fe1ac2fe Cell blueprints now use the /empty variants (#35463)
* Cell blueprints now use the /empty variants

* Add empty stock cell
2018-02-09 12:50:46 -06:00
Jordan Brown
1ee8b3762b Merge pull request #35454 from DaxDupont/You-didn't-have-to-smile-at-me,-Your-grin's-the-sweetest-that-I've-ever-seen,But-you-did.-Yes-you-did
Adds defib to techwebs
2018-02-09 12:49:18 -06:00
Jordan Brown
ee77e12bca Merge pull request #35412 from DaxDupont/flags-are-for-fags
Brings certain designs in line with others.
2018-02-08 09:04:46 -06:00
CitadelStationBot
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
CitadelStationBot
9e229691cc Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304) 2018-02-05 04:23:09 -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
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
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
Poojawa
9755eb28ee compile fixes 2018-02-03 06:32:16 -06:00
Poojawa
a7f0ffb6f0 modules 2018-01-31 06:56:28 -06:00
Poojawa
a24788842b dogborg tweaks, so fuggin DUMB (#5202)
* apparantly you need shuttles, who knew

* some tweaks

Sprites need adjustments
Janidogs need adjustments in UI

* Hm, maybe a fix. Revert attempt to rename sprites

* [MIRROR] Better Chat Squashing (#5193)

* Merge pull request #35058 from uraniummeltdown/chatsquash

Better Chat Squashing

* Better Chat Squashing

* [MIRROR] Sexy Solar Sprites (#5191)

* replaced solar panel sprites with better ones

* Sexy Solar Sprites

* Automatic changelog generation for PR #5191 [ci skip]

* [MIRROR] New Coffin Sprite (#5190)

* coffins have a new sprite (#34995)

* New Coffin Sprite

* Automatic changelog generation for PR #5190 [ci skip]

* [MIRROR] Makes fire colorful and anime (#5187)

* Makes fire colorful and anime (#34977)

* - Makes fire colorful and anime

* - Updates light color on fires
- Makes fire update color less often (1/7th as often)

* - Changes the transition from blue to purple to be much more gradual, it starts at 40000 and peaks at 120000 Kelvin now
- Changes fusion fire (>4 million Kelvin) to have a slight colorshift to it (It's just the druggy overlay).

* - Moves fire above gas (and everything else)
- Changes fire alpha for low temperature fires to compensate for items no longer rendering on top of fire

* - Makes the new fire layer a define and makes sure it isn't above "Hyperspace Ripples" whatever that is

* - Removes comment

* - FIRE_LAYER is already defined for burning humans.

* Makes fire colorful and anime

* Automatic changelog generation for PR #5187 [ci skip]

* [MIRROR] Expand Cyborg (#5183)

* Expand Cyborg (#34958)

* Expand Cyborg

* i ded pls nerf

* Oh sheet

* Expand Cyborg

* Automatic changelog generation for PR #5183 [ci skip]

* [MIRROR] Cosmic Bedsheet (#5170)

* adds cosmic space bedsheet

* Cosmic Bedsheet

* [MIRROR] The punisher no longer punishes ticker subsystems with delayed fires (#5174)

* Merge pull request #34964 from MrStonedOne/patch-463

The punisher no longer punishes ticker subsystems with delayed fires

* The punisher no longer punishes ticker subsystems with delayed fires

* Fuck this I'm done with it
2018-01-30 15:17:46 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
deathride58
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
Jordan Brown
c381c639cb Merge pull request #34906 from epochayur/master
Removes Sulfuric Acid requirements from computer parts
2018-01-26 03:00:32 -06:00
Jack Edge
a07c6c4d9e Nuke op intelligence potions also grant an internal ID
🆑 coiax
add: Syndicate intelligence potions also grant an internal syndicate ID
card to the simple animal granted intelligence. This effectively means
that Cayenne can open the airlocks on the Infiltrator.
/🆑

And also maintenance I guess. But she could already smash her way
through doors.

Why? So Cayenne can open airlocks on the infiltrator. That's why.
2018-01-26 02:59:04 -06:00
Leo
45c46f721e Merge pull request #34859 from tgstation/Cyberboss-patch-4
Removes sulpheric acid requirement from express console circuits
2018-01-25 05:09:41 -06:00
MrDoomBringer
8e090b430b Adds the Bluespace Drop Pod upgrade to the cargo express console 2018-01-23 01:36:43 -06:00
Dax Dupont
c2f5a85394 Adds the camera to the autolathe and changes the materials (#34636) 2018-01-21 21:24:18 -06:00
deathride58
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
deathride58
f92f1f0390 Merge pull request #4839 from Citadel-Station-13/LetterJay-patch-1
Shock collars
2018-01-18 04:56:18 +00:00
kevinz000
62c8371961 Removes sacid requirement 2018-01-17 16:02:57 -06:00
oranges
4a6b246b4c Merge pull request #34473 from kevinz000/techwebs_points
Nerfs techweb cargo points
2018-01-16 14:31:12 -06:00
LetterJay
9598ca100b Shock collars 2018-01-15 02:04:32 -06:00
LetterJay
36a5b861f6 Merge pull request #4754 from Citadel-Station-13/upstream-merge-34216
[MIRROR] Adds Display Name Argument to Techweb Logging
2018-01-11 15:15:54 -06:00
ExcessiveUseOfCobblestone
af4f017b93 Adds Display Name Argument to Techweb Logging (#34216)
* Update _techweb.dm

* Replaces ID with the name of the tech web

* REVERT ON THE WEBBITOR

* Webbitor Blues

* removes "
2018-01-11 07:40:11 -06:00
Tad Hardesty
149542ca26 Replace CentComm with CentCom in deadchat message (#34249) 2018-01-11 07:39:52 -06:00
oranges
1f88c0c660 [READY]Cargo Update: Nanotrasen Supply Drop Pods! 2018-01-10 03:12:07 -06:00
deathride58
e4410a3320 Merge branch 'master' into mapsyncs43293845982 2018-01-08 06:18:11 +00:00
Jordan Brown
f9f6bae65d Merge pull request #34129 from MrDoomBringer/eminem
Adds package wrapping to autolathes
2018-01-07 20:07:00 -06:00
deathride58
aabbbb9dff aaaand the rest of the modules folder 2018-01-04 01:45:38 -05:00