shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,712 Commits 5 Branches 0 Tags
84fe88153ea396ffeff2441af68ee2ecb89d51e7
Commit Graph

241 Commits

Author SHA1 Message Date
deathride58
84fe88153e merges #4208 2017-12-04 16:17:43 -05:00
deathride58
4d29723302 Update lighting.dm 2017-12-03 18:25:54 -05:00
Ashe Higgs
5621507b4a Adds emergency lights, built into light fixtures 2017-12-03 12:54:48 -06:00
Emmett Gaines
9601136df2 sm soundtweak (#33154) 2017-11-30 17:01:29 -06:00
deathride58
837779b683 Merge pull request #4109 from Citadel-Station-13/upstream-merge-33025 
[MIRROR] Fixes Lord Singuloth hungering for more than he should
 2017-11-24 23:15:09 +00:00
Leo
541b8db684 Merge pull request #32985 from YPOQ/airlockfix 
Fixes AIs being unable to interact with unscrewed airlocks
 2017-11-24 14:11:39 -06:00
ShizCalev
2762e3b530 Fixes Lord Singuloth hungering for more than he should 2017-11-24 13:00:42 -06:00
LetterJay
eba36e48f9 Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188 
[MIRROR] JSON feedback
 2017-11-22 18:42:34 -06:00
Matt Smith
694958f587 Update Turbine computer to use TGUI 2017-11-21 22:28:14 -06:00
deathride58
1f6b3ce629 Merge branch 'master' into upstream-merge-32188 2017-11-21 19:53:58 +00:00
Jordan Brown
2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
Jordie
752bc654ae Makes some turning procs consistently turn clockwise 2017-11-19 22:25:17 -06:00
deathride58
6a05a54c96 Update cell.dm 2017-11-18 23:31:32 -05:00
ShizCalev
c2000cc31a Fixes inconsistencies w/ energy descriptions 2017-11-18 14:18:14 -06:00
deathride58
eeba86e27e Merge branch 'master' into upstream-merge-32188 2017-11-18 05:31:42 +00:00
deathride58
98ce27d0ad Update cell.dm 2017-11-17 23:37:32 -05:00
Jordie
b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
vuonojenmustaturska
6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
LetterJay
2f71e0f724 Merge pull request #3944 from Citadel-Station-13/upstream-merge-32714 
[MIRROR] Tesla no longer NOTHING PERSONNEL's the power beacon
 2017-11-15 10:40:59 -06:00
Robustin
6a0b00ead6 Tesla no longer NOTHING PERSONNEL's the power beacon 2017-11-14 14:13:27 -06:00
AutomaticFrenzy
b9c9b87441 Alt clicking additions (#32607) 
Adds alt clicking to lock/unlock for apc and air alarm
 2017-11-14 13:49:32 -06:00
LetterJay
304cfeb262 Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947 
[MIRROR] Pirate ship event
 2017-11-13 11:52:40 -06:00
LetterJay
228aed8b35 Merge pull request #3902 from Citadel-Station-13/upstream-merge-32546 
[MIRROR] Refactor of base machinery a tiny bit more. DONE
 2017-11-13 11:44:46 -06:00
oranges
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
LetterJay
3ea8808201 Merge pull request #3673 from Citadel-Station-13/upstream-merge-32161 
[MIRROR] 512 forward compatibility merge
 2017-11-12 23:06:55 -06:00
Jalleo
300c471da9 Refactor of base machinery a tiny bit more. DONE (#32546) 
* Moves a base uid from machienry to a bunch of children as it was literally setting a var that most machines never used. This is probably a good candidate for a component replacement.

* Just checking something

* Does this fix the compiling not working properly?

* And this?

* What is going wrong ugh!

* params["target"] instead of params["set"] bug was there before I even touched it but my compiling of TGUI caused it or something?

* Slight tidying up for what Cyberboss and Antur likes.

* Fixes the things that I was asked to fix
 2017-11-12 13:19:23 -06:00
LetterJay
6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
as334
7f9800e8fa Assmos tweaks/minor additions. (#32400) 
* Adds pluoxium formation, makes fusion radioactive and nerfs it, makes noblium cost more energy.

* Review response.

* tanks now melt above 1 Million degrees Kelvin.
 2017-11-10 01:31:16 -06:00
oranges
59f3a714e2 Merge pull request #32250 from ninjanomnom/map-cable-color 
Makes greyscaled cables' color viewable in map editing
 2017-10-31 15:30:45 -05:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
Jordan Brown
1d8184e206 Merge pull request #32142 from optimumtact/boiwhatarethose 
Remove stray parent proc call in collector code
 2017-10-27 17:31:19 -05:00
LetterJay
141de52658 Merge pull request #3641 from Citadel-Station-13/upstream-merge-30791 
[MIRROR] Assmos part 1, #2
 2017-10-27 02:47:56 -04:00
LetterJay
6b0bb7268e Merge pull request #3611 from Citadel-Station-13/upstream-merge-31945 
[MIRROR] Adds ambience to the SM and portable generators
 2017-10-27 02:16:02 -04:00
as334
eb4f6326d7 Assmos part 1, #2 2017-10-26 23:12:27 -05:00
Emmett Gaines
c7d3696636 Adds ambience to the SM and portable generators (#31945) 
* Adds aambience to the SM and portable generators

* lowered pitch of supermatter

* start and end fix
 2017-10-25 23:37:14 -05:00
Emmett Gaines
ae86a75362 Greyscale cables 2017-10-25 21:46:57 -05:00
LetterJay
a1236008f3 Merge pull request #3552 from Citadel-Station-13/upstream-merge-31355 
[MIRROR] Code Consistency: luminosity --> light_range
 2017-10-23 03:44:46 -04:00
Firecage
25b5bb3e44 Code Consistency: luminosity --> light_range 2017-10-22 00:06:35 -05:00
ShizCalev
0a14bf3fd4 Adds sanity check to Narsie pickcultist proc (#31937) 
* Adds sanity check to Narsie pickcultist proc

* claned up src

* cleaned
 2017-10-21 18:52:23 -05:00
CitadelStationBot
d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165) 
* Grammar fixes to atom descriptions

* compile errors
 2017-10-21 07:17:03 -05:00
CitadelStationBot
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
LetterJay
fe05d8aaaf Merge pull request #3506 from Citadel-Station-13/upstream-merge-31754 
[MIRROR] Stops manned turrets from firing when the user unbuckles themselves from the turret
 2017-10-19 09:24:04 -04:00
vuonojenmustaturska
7045809aa2 Stops manned turrets from firing when the user unbuckles themselves from the turret (#31754) 
* The clown is drunk, and the cards of death wait on him

* Update power.dm
 2017-10-19 05:41:41 -05:00
Emmett Gaines
04d26d561a Radiation makes you vomit blood and more balance changes (#31753) 2017-10-18 09:25:11 -05:00
Ashe Higgs
4fd360c694 Fixes cogged APCs being permanently locked to non-servants (#31673) 
* Fixes cogged APCs being inaccessible

* Doop ba doop
 2017-10-16 16:49:01 -05:00
LetterJay
568ed91f28 Merge pull request #3430 from Citadel-Station-13/upstream-merge-30599 
[MIRROR] Moves projectile processing to a subsystem
 2017-10-16 10:39:41 -04:00
kevinz000
ed96224d3a Moves projectile processing to a subsystem 2017-10-15 21:51:24 -05:00
KorPhaeron
6ea3f1293c You can smash the bulbs in floodlights (#31690) 
* You can smash the bulbs in floodlights

* Floodlight breaking but properly
 2017-10-15 12:55:31 -05:00
LetterJay
b6f69c88ea Merge pull request #3402 from Citadel-Station-13/upstream-merge-31553 
[MIRROR] Removes a bunch of sleeps/spawns and makes a few booleans defines
 2017-10-15 10:22:59 -04:00
kevinz000
b20e5916ea Removes a bunch of sleeps/spawns and makes a few booleans defines 2017-10-14 18:53:48 -05:00