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
LetterJay
01b0e754c2
Merge pull request #2679 from Citadel-Station-13/upstream-merge-30531
...
[MIRROR] Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter
2017-09-12 02:35:17 -05:00
Firecage
1e0297f9ef
Adds cybernetic lungs(and an upgraded and actually useful variety) to the game. ( #30382 )
...
* Adds cybernetic lungs
* Added better cold thresholds to the upgraded cybernetic lungs. Heat threshold remains the same though for balance reasons.
* Adds an EMP effect to cybernetic lungs.
2017-09-10 14:31:47 -05:00
Kerbin-Fiber
d158ec9528
Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter
2017-09-10 03:43:09 -05:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
CitadelStationBot
5fd31559ea
[MIRROR] Fixed typo for cyberimp_surgical's ID ( #2229 )
...
* Fixed typo for cyberimp_surgical's ID
* Delete medical_designs.dm.rej
* Update medical_designs.dm
2017-08-05 10:29:02 -07:00
CitadelStationBot
fd59456a73
[MIRROR] Adds Surgical toolarms to R&D, makes them less robust ( #2197 )
...
* Adds Surgical toolarms to R&D, makes them less robust
* Delete medical_designs.dm
* Delete augments_arms.dm
* Delete tools.dm
2017-08-05 10:27:12 -07:00
CitadelStationBot
d2e771c9f3
Adds cybernetic organs ( #2135 )
2017-07-26 00:04:59 -07:00
CitadelStationBot
2d84e09851
Fixes plasma glass merging with normal glass
2017-07-08 09:45:46 -05:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
65736b7e23
[MIRROR] Ports the Ore Redemption Machine to TGUI ( #1414 )
...
* Ports the Ore Redemption Machine to TGUI
* Update tgui.css
* Update tgui.js
* Delete tgui.css.rej
* Delete tgui.js.rej
2017-06-28 02:24:55 -05:00
CitadelStationBot
2530d8a09a
Intercoms are now constructable
2017-06-23 13:40:25 -05:00
CitadelStationBot
35ac6c40e0
Remember to test your PRs, kids! - Rebalances matter cartridge cost redux ( #1652 )
2017-06-20 07:59:04 -07:00
LetterJay
d65e8667e7
Merge pull request #1465 from Citadel-Station-13/upstream-merge-28160
...
[MIRROR] Fixes ORM alloy material consumption
2017-06-19 15:51:08 -05:00
CitadelStationBot
9273f20ff3
Removes tech requirement from flashes
2017-06-16 16:25:44 -05:00
LetterJay
4c1b223248
Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync
...
Selective mirror sync
2017-06-14 06:41:01 -05:00
CitadelStationBot
e9f3bc7f1e
Adrenaline and freedom implants in rnd have been replaced with tracking and chem ones ( #1453 )
2017-06-13 13:46:20 -07:00
LetterJay
226345d82a
upstream-merge-28109
...
upstream-merge-28352
2017-06-13 01:10:21 -05:00
LetterJay
b80a184d97
up to upstream-merge-27868
2017-06-11 00:04:00 -05:00
CitadelStationBot
addb6aca21
Fixes ORM alloy material consumption
2017-06-07 19:26:44 -05:00
CitadelStationBot
0ad1bb5259
Adds a disk slot to the ORM, to allow the uploading of new smelter designs ( #980 )
2017-05-18 11:53:47 -05:00
CitadelStationBot
6a2916a171
[MIRROR] Bluespace Launchpads ( #879 )
...
* Bluespace Launchpads
* Delete runtimestation.dmm.rej
* Delete tgstation.dme.rej
* Delete tgui.js.rej
* Update tgui.js
2017-05-18 07:12:13 -05:00
CitadelStationBot
d2be6cfeb5
Refactors leather & Crafting with Bigenerator ( #849 )
2017-05-18 01:11:58 -05:00
LetterJay
96e128ecb7
Merge pull request #854 from Citadel-Station-13/upstream-merge-27036
...
[MIRROR] Add Slime Scanner to Autolathe
2017-05-14 16:39:28 -04:00
CitadelStationBot
bbff27bd58
[MIRROR] Make Lathe Design Names Capitalized Consistently ( #860 )
...
* Make Lathe Design Names Capitalized Consistently
* Delete biogenerator_designs.dm.rej
2017-05-10 16:14:06 -07:00
CitadelStationBot
1f349ecc72
Add Slime Scanner to Autolathe
2017-05-08 13:50:07 -05:00
CitadelStationBot
4da7414339
Old ore processor cleanup
2017-04-29 03:46:03 -05:00
Poojawa
9e72b1b8fd
/tg/ 4/14 ( #367 )
...
* outside code stuff
* defines, helpers, etc
* everything not module
* modules
* compiled fixes + missing sounds
2017-04-14 23:28:04 -05:00
Poojawa
7e9b96a00f
April sync ( #360 )
...
* Maps and things no code/icons
* helpers defines globalvars
* Onclick world.dm orphaned_procs
* subsystems
Round vote and shuttle autocall done here too
* datums
* Game folder
* Admin - chatter modules
* clothing - mining
* modular computers - zambies
* client
* mob level 1
* mob stage 2 + simple_animal
* silicons n brains
* mob stage 3 + Alien/Monkey
* human mobs
* icons updated
* some sounds
* emitter y u no commit
* update tgstation.dme
* compile fixes
* travis fixes
Also removes Fast digest mode, because reasons.
* tweaks for travis Mentors are broke again
Also fixes Sizeray guns
* oxygen loss fix for vore code.
* removes unused code
* some code updates
* bulk fixes
* further fixes
* outside things
* whoops.
* Maint bar ported
* GLOBs.
2017-04-13 23:37:00 -05:00
LetterJay
ba94d1f30b
disables flightsuits
2017-04-01 09:52:38 -05:00
