Commit Graph

91 Commits

Author SHA1 Message Date
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
Dax Dupont
a0feb17597 Cell chargers are now buildable and (upgradable!) machines. 2018-02-12 11:15:52 -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
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
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
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
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
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
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
kevinz000
62c8371961 Removes sacid requirement 2018-01-17 16:02:57 -06:00
LetterJay
9598ca100b Shock collars 2018-01-15 02:04:32 -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
kevinz000
a82d0e13ce Fixes RND 2017-12-22 00:58:46 -08:00
jughu
2c4e5bae9e Fixes grammer issue (#33679) 2017-12-20 12:02:25 -06:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
2017-12-11 16:36:38 -08:00
Ashe Higgs
315e1d718a Adds pet carriers 2017-12-08 10:34:05 -06:00
oranges
4204c889ed Merge pull request #32964 from AutomaticFrenzy/patch/joules
Measure energy values in joules
2017-12-05 03:23:06 -06:00
deathride58
64aadb868e Merge branch 'master' into upstream-merge-33213 2017-12-04 21:39:30 +00:00
deathride58
7150e738e7 Update autolathe_designs.dm 2017-12-04 16:08:49 -05:00
AnturK
1cc3e33714 Holorecord disks. 2017-12-04 05:14:13 -06:00
Ashe Higgs
5621507b4a Adds emergency lights, built into light fixtures 2017-12-03 12:54:48 -06:00
deathride58
e06b368fdb Update medical_designs.dm 2017-11-28 22:32:23 -05:00
ACCount
f089b9ca2d Removes mass-spectrometers 2017-11-28 06:27:55 -06:00
ACCount
2147c60b7f Replaces "console screen" stock part with glass sheets 2017-11-23 18:53:47 -06:00
deathride58
d5a8e2f13b Update telecomms_designs.dm 2017-11-22 20:10:41 -05:00
oranges
c2c22d56c7 [READY]NTnet refactor, assimilates exonet 2017-11-22 15:52:54 -06:00
Jordan Brown
2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
ShizCalev
c2000cc31a Fixes inconsistencies w/ energy descriptions 2017-11-18 14:18:14 -06:00
arsserpentarium
d8847ea167 [READY]integrated circuitry port+upgrade. 2017-11-14 05:00:48 -06:00
vuonojenmustaturska
cc438ea9b4 Refactors and improvements to xenobio slime processor (#32406)
* Do not let your memes be dreams

* static lists for great justice

* Local man forgets to capitalize a word

* Slime processor no longer runtimes when processing food
2017-11-05 04:32:07 -06:00
Robustin
a570ec8610 Adds the Chemistry Smoke Machine (#30920)
* Smoke Machine

* Tweak

* More responsive smoke timing

* Antur Review and Admin Logs

* Cboss review

* More logging

* Removes analyze, streamlines logs

* r-e-a

* no s in reagents_list

* Cyberboss Review

* woops

* Cboss nitpicking
2017-10-10 13:13:38 -05:00
Jordan Brown
58fd7f2067 Merge pull request #31413 from vuonojenmustaturska/codejanitoring
Removes useless commented-out what-if code from the 1970s
2017-10-08 10:00:34 -05:00
WewLads
7f77e08c0b Changed OneHuman to OneCrew lawset (#3172)
* You can now slap butts

Disarm Intent + Target Groin = Butt Slap. Deals 1 damage to both the
victim's torso and the target's active hand.

* Fixed the drying rack

* Changes OneCrew to OneHuman

* Revert "Changes OneCrew to OneHuman"

This reverts commit 34e2ae378acff838013ed9c15ff85901740e9cdd.

* Revert "Revert "Changes OneCrew to OneHuman""

This reverts commit bc0f46d387ff7cd621b5331ad4d916f4a49ff2f0.

* Revert "Changes OneCrew to OneHuman"

This reverts commit 34e2ae378acff838013ed9c15ff85901740e9cdd.

* Changed OneHuman to OneCrew

* Revert "Fixed the drying rack"

This reverts commit 1351e2f38ed819b734a558fbeb9ef839cddf2b8f.

* Revert "You can now slap butts"

This reverts commit 9b1d6808d8e24cc9b2f5d28384b3ffe633d811fe.
2017-10-06 11:36:52 -07:00
Kevak
f4ce4a3a27 Shock Collars Are Now A Thing.
Exactly what it says on the tin.
2017-10-03 08:03:03 -07:00
CitadelStationBot
6efb76fad5 [MIRROR] Ammo cleanup (#2643)
* Ammo cleanup

* Update briefcase.dm

* Update manned_turret.dm

* Update mime.dm

* Update manned_turret.dm

* Update manned_turret.dm

* fixes

* mime memes
2017-09-22 22:30:44 -05:00
CitadelStationBot
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