e06b368fdb
Update medical_designs.dm
2017-11-28 22:32:23 -05:00
f089b9ca2d
Removes mass-spectrometers
2017-11-28 06:27:55 -06:00
c9f0f4923f
Update rdconsole.dm
2017-11-26 21:34:09 -05:00
437c527fd2
Fixes rdconsole emagging
2017-11-25 15:17:52 -06:00
d5d89a57b4
Update stock_parts.dm
2017-11-23 23:50:25 -05:00
2147c60b7f
Replaces "console screen" stock part with glass sheets
2017-11-23 18:53:47 -06:00
c76cacdf77
Merge pull request #4081 from Citadel-Station-13/upstream-merge-32914
...
[MIRROR] [READY]NTnet refactor, assimilates exonet
2017-11-23 01:40:54 +00:00
d5a8e2f13b
Update telecomms_designs.dm
2017-11-22 20:10:41 -05:00
eba36e48f9
Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
...
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
c2c22d56c7
[READY]NTnet refactor, assimilates exonet
2017-11-22 15:52:54 -06:00
b925c0e265
Update server.dm
2017-11-22 14:20:45 -05:00
61ae95da33
Gives the R&D Server a description and makes its name improper
2017-11-21 22:28:23 -06:00
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
3b0a71006c
Update experimentor.dm
2017-11-20 22:32:20 -05:00
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
c2000cc31a
Fixes inconsistencies w/ energy descriptions
2017-11-18 14:18:14 -06:00
eeba86e27e
Merge branch 'master' into upstream-merge-32188
2017-11-18 05:31:42 +00:00
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
d8847ea167
[READY]integrated circuitry port+upgrade.
2017-11-14 05:00:48 -06:00
43113cd9b5
Merge pull request #31947 from AnturK/yarr
...
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.
If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.
There's an internal GPS onboard so crew will always be able to follow the shuttle.
Crew of 3, moderately armed. (Balance pending)
Shuttle engines have 3 minute cooldown between jumps.
Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
2017-11-13 03:19:38 -06:00
768e80544e
Update autolathe_designs.dm
2017-11-12 15:41:25 -06:00
f812be1ee0
Update autolathe_designs.dm
2017-11-12 14:46:18 -06:00
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
1aeb81cc25
Ensures sentienced animals know how to speak all the languages their master does ( #32518 )
...
* Ensures sentienced animals know how to speak Common
* Give all of master's languages
* Languages
2017-11-09 11:08:25 -06:00
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
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
af71944d71
Fixes xenobio sentience giving the wrong name ( #32016 )
2017-10-24 00:04:33 -05:00
d7ee78ec0d
Update xenobiology.dm
2017-10-23 01:27:54 -05:00
60e45814ab
Removes golem rune code
2017-10-23 00:10:47 -05:00
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
ed96224d3a
Moves projectile processing to a subsystem
2017-10-15 21:51:24 -05:00
24b9d4b9f4
Fixes camera mobs becoming contaminated and other tweaks ( #31731 )
2017-10-14 17:40:34 -05:00
d6903bcf3c
Merge branch 'master' into upstream-merge-31601
2017-10-14 10:17:16 -04:00
bd7a0d65b5
Fix many instances of "the the"
2017-10-13 09:41:54 -05:00
55e8f6526c
Radiation rework and subsystem
2017-10-13 09:22:23 -05:00
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
a6ac800db0
Allows you to choose how much to insert into protolathe/exofab/circuitprinter/dronedispenser ( #31399 )
...
* precision
* precision
* sanity checks
* itt kevinz doesn't know how cyberboss procs work
* fixes
* allows user cancellation
* im dumb
* itt: im still dumb
* fixes stuff, makes it set on init
* refactors reagentgrinder code
* more fixes, prevents melee attacks from going anyways
* ...? wtf is with usetopic
* Finally found out what's wrongw ith this thing.
* fixes a mistake
2017-10-10 03:11:50 -05:00
f046f4f15b
Merge pull request #3225 from Citadel-Station-13/upstream-merge-31413
...
[MIRROR] Removes useless commented-out what-if code from the 1970s
2017-10-08 16:22:10 -04:00
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
075cb673c0
Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-07 12:37:06 -05:00
89ab9a0fd7
Update rdconsole.dm
2017-10-06 22:24:24 -05:00
6a4fb2b26a
actually fixes the exploit this time
2017-10-06 20:38:53 -05:00
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
f4ce4a3a27
Shock Collars Are Now A Thing.
...
Exactly what it says on the tin.
2017-10-03 08:03:03 -07:00
82981339ed
Adds desc to things lacking them.
2017-10-01 15:07:37 -05:00
724fa8ce54
[READY]Refactors timestops to use fields ( #30858 )
...
* kek
* fixes
* Fixes
* fixes
* throw freeze
* woops
* double woops
2017-09-28 21:46:34 -05:00
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
0925853992
[MIRROR] [S] fixes sentience potions working through cams ( #2896 )
...
* Fixes sentience potions working through cams (#30914 )
* [S] fixes sentience potions working through cams
2017-09-22 19:00:07 -05:00
deathride58