shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,851 Commits 5 Branches 0 Tags
1d4ae5196cf364dfd9f9cdcff1e2880caebd17ce
Commit Graph

220 Commits

Author SHA1 Message Date
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
Emmett Gaines
24b9d4b9f4 Fixes camera mobs becoming contaminated and other tweaks (#31731) 2017-10-14 17:40:34 -05:00
LetterJay
d6903bcf3c Merge branch 'master' into upstream-merge-31601 2017-10-14 10:17:16 -04:00
LetterJay
80eefdd6a0 Update collector.dm 2017-10-13 22:32:45 -05:00
Jordan Brown
bd7a0d65b5 Fix many instances of "the the" 2017-10-13 09:41:54 -05:00
Emmett Gaines
55e8f6526c Radiation rework and subsystem 2017-10-13 09:22:23 -05:00
Jordan Brown
572f3b8905 Merge pull request #31585 from ShizCalev/empty-light-editor-fix 
Fixes empty light fixtures showing as working lights in DM
 2017-10-12 15:27:37 -05:00
duncathan salt
c0e9cde5c2 Minor refactor of how gas IDs are handled 2017-10-12 00:30:09 -05:00
Leo
ed3a031543 Merge pull request #31497 from AnturK/cyberboss-pls 
Fixes some tempremoves
 2017-10-10 07:10:35 -05:00
Tad Hardesty
01ecdff51a Improve extended examination text for many objects (#31381) 
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
 2017-10-10 03:07:38 -05:00
Robustin
c40b82c07d Fixes Teslas always doing the same movement pattern (#31469) 
* Random tesla movement

* Parenthesis
 2017-10-09 19:01:31 -05:00
Jordan Brown
075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
LetterJay
cf37555c4d Merge pull request #3151 from Citadel-Station-13/upstream-merge-31302 
[MIRROR] Move shuttleRotate into the shuttle module
 2017-10-05 09:13:41 -04:00
oranges
cedb56af1b Merge pull request #31302 from ninjanomnom/shuttle-rotation 
Move shuttleRotate into the shuttle module
 2017-10-05 03:05:32 -05:00
Leo
39cf9bb7a0 Merge pull request #31286 from KorPhaeron/ismachinery 
ismachinery define
 2017-10-04 19:26:38 -05:00
LetterJay
0206e3f775 Update particle.dm 2017-10-03 18:48:18 -05:00
MoreRobustThanYou
f78d0988ab Blobs now take damage from particle accelerators 2017-10-03 18:12:52 -05:00
MoreRobustThanYou
f870b66b31 Makes antimatter code less shit (#31219) 
* Antimatter shielding that can't find a control unit won't delete itself anymore

* Update shielding.dm

* Update shielding.dm

* Update shielding.dm

* Update shielding.dm

* Update shielding.dm

* Update shielding.dm

* gthruhru

* thanks Antur
 2017-10-03 04:40:47 -05:00
KorPhaeron
3e26e09db8 ismecha define 2017-10-02 01:04:53 -05:00
LetterJay
f538d91fe8 Merge pull request #3047 from Citadel-Station-13/upstream-merge-31145 
[MIRROR] Fixes aliums being able to attack the SM crystal
 2017-10-01 16:31:44 -04:00
ShizCalev
770a0a1154 Fixes aliums being able to attack the SM crystal 2017-10-01 05:04:30 -05:00
Leo
fd7c9110ca Structure istype define 2017-09-30 21:31:57 -05:00