shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,855 Commits 5 Branches 0 Tags
4d79c5ef09e5057ea2b5366eefb0ff30bfa031a2
Commit Graph

4131 Commits

Author SHA1 Message Date
kevinz000
bae1993861 Update pipe_dispenser.dm 2018-06-25 06:19:30 -07:00
LetterJay
acd10b02cf Merge pull request #7195 from Citadel-Station-13/upstream-merge-38574 
[MIRROR] Global component signals
 2018-06-24 18:20:17 -05:00
LetterJay
91d40042a4 Merge pull request #7181 from Citadel-Station-13/upstream-merge-38557 
[MIRROR] Fix some shuttle chair stuff
 2018-06-24 18:19:18 -05:00
LetterJay
72bc5121bd Merge pull request #7233 from Citadel-Station-13/upstream-merge-38653 
[MIRROR] Ports more things to Initialize
 2018-06-24 18:12:40 -05:00
LetterJay
269a375927 Merge pull request #7221 from Citadel-Station-13/upstream-merge-38321 
[MIRROR] [READY] better contraband crates
 2018-06-24 15:33:05 -05:00
LetterJay
057350d7dc Merge pull request #7220 from Citadel-Station-13/upstream-merge-38093 
[MIRROR] Fixes and adds blast cannons to traitor science uplink items
 2018-06-24 15:32:49 -05:00
LetterJay
0a28cbdfc4 Merge pull request #7217 from Citadel-Station-13/upstream-merge-38570 
[MIRROR] Fixes gulag stacker not giving points after RPG loot event
 2018-06-24 15:16:35 -05:00
LetterJay
8f7ca9fbba Merge pull request #7211 from Citadel-Station-13/upstream-merge-38534 
[MIRROR] Fixes AI's being unable to call shuttle using comm console.
 2018-06-24 15:16:09 -05:00
LetterJay
ce9d797ac5 Merge pull request #7190 from Citadel-Station-13/upstream-merge-38577 
[MIRROR] PDA can be ctrl-clicked to remove the item in its pen slot
 2018-06-24 15:07:54 -05:00
LetterJay
06c7cebb82 Merge pull request #7188 from Citadel-Station-13/upstream-merge-38319 
[MIRROR] [READY] Helps data disks stop being unemployed
 2018-06-24 15:07:14 -05:00
Jordan Brown
a73bfd0913 Ports more things to Initialize (#38653) 2018-06-24 05:17:15 -05:00
CitadelStationBot
386bc528ea [MIRROR] Add logging to teleport and the teleporter destination setting (#7225) 
* Add logging to teleport and the teleporter destination setting (#38645)

Helps with some admin issues

* Add logging to teleport and the teleporter destination setting
 2018-06-22 00:34:41 -07:00
Tlaltecuhtli
01eb1bc7fe [READY] better contraband crates (#38321) 
feature: NT reports that the local contraband market has expanded, experts say that the Syndicate is involved.
 2018-06-21 18:52:15 -05:00
kevinz000
561c2179f8 Fixes and adds blast cannons to traitor science uplink items (#38093) 
rscadd: Blast cannons have been fixed and are now available for purchase by traitorous scientists for a low low price of 14TC.
rscadd: Blast cannons take the explosive power of a TTV bomb and ejects a linear projectile that will apply what the bomb would do to a certain tile at that distance to that tile. However, this will not cause breaches, or gib mobs, unless the gods (admins) so will it.
experimental: Blast cannons do not respect maxcap. (Unless the admins so will it.)
 2018-06-21 18:38:46 -05:00
YPOQ
a6cfd22b79 Fixes gulag stacker not giving points after RPG loot event (#38570) 
* Fixes gulag stacker not giving points after RPG loot event

* Moves point values to type vars

* cleanup
 2018-06-21 16:30:39 -05:00
CitadelStationBot
3d1faff99b [MIRROR] Adds desc to IV drips (#7205) 
* Merge pull request #38608 from 81Denton/iv-drip-desc

Adds desc to IV drips

* Adds desc to IV drips
 2018-06-20 22:39:29 -07:00
AnturK
5e156e7a07 Fixes AI's being unable to call shuttle using comm console. (#38534) 
* Fixes AI's being unable to call shuttle using comm console.

* Lets get rid of double negatives

* viewvers for
 2018-06-20 19:39:17 -05:00
CitadelStationBot
25ba25d997 [MIRROR] [s]Fixed being able to create nearly infinite amount of materials from autolathes (#7199) 
* [s]Fixed being able to create nearly infinite amount of materials from autolathes (#38624)

* clamper-oni

* Update autolathe.dm

* Update autolathe.dm

* [s]Fixed being able to create nearly infinite amount of materials from autolathes
 2018-06-20 17:23:02 -07:00
Jordan Brown
c11557d23d Global component signals 2018-06-19 17:18:34 -05:00
Irafas
75335cb30b PDA can be ctrl-clicked to remove the item in its pen slot (#38577) 
* Makes pens ez to remove from pda

Players can now ctrl click on the PDA to remove the pen without having to remove the ID first.

* added instructions when examined.

Like how it tells the user they can use alt-click to remove contents, it now says they can use ctrl-click to remove items from the pen slot.

* PDA can now be dragged without dropping the pen.

When ctrl-clicked it now checks to see if the PDA is on a turf and will only output the pen if its not.

* quick change to examine text.

* comma

* Improved the examine
 2018-06-19 09:49:36 -05:00
JStheguy
02744c59a5 [READY] Helps data disks stop being unemployed (#38319) 
* data cards actually have a function now

* Adds data cards to the IC printer for real rea

* more cards, less shitty code

* how the fuck did I miss that

adds a missing ..()

* wait wrong use of ..() fuck
 2018-06-19 09:23:33 -05:00
Jordan Brown
2cd16aa1ad Fix some shuttle chair stuff (#38557) 
* Fix shuttle chair stuff

* Remove redundancy
 2018-06-19 01:29:17 -05:00
LetterJay
7ab66531bf Merge pull request #7162 from Citadel-Station-13/upstream-merge-38539 
[MIRROR] Adds New Shuttle Chairs
 2018-06-18 21:58:42 -05:00
CitadelStationBot
db25067491 adds missing /'s at the starts of some obj instances (#7169) 2018-06-18 11:53:33 -07:00
CitadelStationBot
03a22ca16d [MIRROR] Transit space refactor (#7130) 
* Transit space refactor

* Update bitfields.dm
 2018-06-18 11:51:02 -07:00
LetterJay
81b88d0d85 Merge pull request #7166 from Citadel-Station-13/upstream-merge-38543 
[MIRROR] Fix non-secure windoors not supporting One Required access mode
 2018-06-18 12:30:26 -05:00
LetterJay
fb53413ded Merge pull request #7160 from Citadel-Station-13/upstream-merge-38270 
[MIRROR] [READY] advanced foam extinguisers [READY]
 2018-06-18 12:28:42 -05:00
LetterJay
6d74717b39 Merge pull request #7158 from Citadel-Station-13/upstream-merge-38533 
[MIRROR] Adds dance machine, drink dispensers, flavor to beach bum ruin
 2018-06-18 12:27:45 -05:00
LetterJay
78265ad51b Merge pull request #7144 from Citadel-Station-13/upstream-merge-38524 
[MIRROR] Fix some of the Lavaland roundstart atmos active turfs
 2018-06-18 10:10:49 -05:00
LetterJay
c58dbc1110 Merge pull request #7138 from Citadel-Station-13/upstream-merge-38476 
[MIRROR] [s] Fix launchpads creating way too many sparks
 2018-06-18 10:09:42 -05:00
LetterJay
c40a2e698d Merge pull request #7137 from Citadel-Station-13/upstream-merge-38496 
[MIRROR] Fix being able to pull mirage borders, others
 2018-06-18 10:09:20 -05:00
LetterJay
aa0e383a2c Merge pull request #7125 from Citadel-Station-13/upstream-merge-38490 
[MIRROR] Fixes missing creampies
 2018-06-18 09:50:56 -05:00
LetterJay
a97514965a Merge pull request #7124 from Citadel-Station-13/upstream-merge-38486 
[MIRROR] Removes an unused open turf var
 2018-06-18 09:50:35 -05:00
Tad Hardesty
896942dcf1 Fix non-secure windoors not supporting One Required access mode (#38543) 2018-06-18 09:39:00 -05:00
fludd12
96b620d540 Adds New Shuttle Chairs (#38539) 
* I'm crashing this shuttle with no survivors.

* comma comma comma comma comma chameleon
 2018-06-18 09:38:25 -05:00
Tlaltecuhtli
1a42719d80 Advanced foam extinguisers (#38270) 
* mining voucher tweak

* will it blend

* d

* s

* ss

* advanced fire extinuishers

* remove trash

* garbage cleaning

* lets see

* t

* whatever

* test if using a var compiles

* adds it to cargo

* adds to atmos + ce

* should fix the sprites

* lowers the volume of the foam tank

* gonna load the icon for this soon

* woops

* foam icon

* ddd

* it works

* boo

* r34ijfirgv5
 2018-06-18 09:38:07 -05:00
81Denton
241d0c7a9a Adds dance machine, drink dispensers, flavor to beach bum ruin (#38533) 
* shit was SO cash

* correct dance machine subtype

* moves defines from map file to corpse.dm

* improves bartender flavor text

* adds special shadycigs for beach ruin, adds shower, moves bartender sleeper to backroom
 2018-06-18 09:37:48 -05:00
Tad Hardesty
27b80045ad Fix some of the Lavaland roundstart atmos active turfs (#38524) 2018-06-17 03:15:08 -05:00
LetterJay
21af80d0d8 Merge pull request #7122 from Citadel-Station-13/upstream-merge-38493 
[MIRROR] Corrects typos
 2018-06-16 16:42:36 -05:00
LetterJay
5cf9320999 Merge pull request #7117 from Citadel-Station-13/upstream-merge-38477 
[MIRROR] [s] Prevent unbreakable ladders from being moved by shuttles
 2018-06-16 16:17:45 -05:00
LetterJay
351f43a392 Merge pull request #7113 from Citadel-Station-13/upstream-merge-38500 
[MIRROR] Fixes attacking wooden walls
 2018-06-16 16:17:28 -05:00
Jordan Brown
e95851c8f6 Merge pull request #38476 from AutomaticFrenzy/patch/sparks 
[s] Fix launchpads creating way too many sparks
 2018-06-16 15:53:42 -05:00
Jordan Brown
9acc97dabe Merge pull request #38496 from AutomaticFrenzy/patch/mirage-borders 
Fix being able to pull mirage borders, others
 2018-06-16 15:50:27 -05:00
Dax Dupont
bde58b5442 Fixes missing creampies (#38490) 2018-06-16 06:19:45 -05:00
Emmett Gaines
3e8168890f Removes an unused open turf var (#38486) 2018-06-16 06:19:37 -05:00
Jordan Brown
c25971d569 Merge pull request #38493 from ShizCalev/typo-fix 
Corrects typos
 2018-06-16 06:19:20 -05:00
Tad Hardesty
a7b900425b [s] Prevent unbreakable ladders from being moved by shuttles (#38477) 
* Prevent unbreakable ladders from being moved by shuttles

* Disconnect ladders before and reconnect them after shuttle move
 2018-06-16 06:18:08 -05:00
Emmett Gaines
1f3bbebe0a Moves arch component application to where archdrops is defined (#38487) 2018-06-16 06:17:48 -05:00
AnturK
460bcd399d Fixes attacking wooden walls (#38500) 2018-06-16 06:17:10 -05:00
CitadelStationBot
4780f3a20b [MIRROR] Add a missing space in mechacode (#7080) 
* Merge pull request #38413 from Tlaltecuhtli/patch-45

Add a missing space in mechacode

* Add a missing space in mechacode
 2018-06-15 02:50:06 -07:00