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

2515 Commits

Author SHA1 Message Date
deathride58
f83ce9cd11 Merge pull request #4073 from Citadel-Station-13/upstream-merge-32937 
[MIRROR] Simple wall turret buff
 2017-11-24 00:19:24 +00:00
Jordan Brown
8943bf0184 Merge pull request #33041 from MrStonedOne/patch-452 
Lowers the stress the dna console puts on the string tree
 2017-11-23 12:07:17 -06:00
deathride58
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
deathride58
435ac739fc Update machine_circuitboards.dm 2017-11-22 20:09:18 -05: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
oranges
c2c22d56c7 [READY]NTnet refactor, assimilates exonet 2017-11-22 15:52:54 -06:00
deathride58
2e9f3bc1c0 Merge pull request #4071 from Citadel-Station-13/upstream-merge-32968 
[MIRROR] Fixes bartender suit having an adjust state
 2017-11-22 20:50:45 +00:00
deathride58
d86bdf2150 Update trash.dm 2017-11-22 14:44:09 -05:00
AnturK
64c7fa0cfd Simple wall turret buff (#32937) 
* Simple wall turret buff

* Adds mapper support
 2017-11-22 12:44:59 -06:00
ShizCalev
6ab499b57b Fixes bartender suit having an adjust state 2017-11-22 12:40:32 -06:00
Tad Hardesty
38c45fb479 Refactor chasm paths to be more sane (#32701) 
In addition, makes chasm handling a component, so it could be reused for
chasm-likes which are not quite chasms.

Also fixes a couple of bugs relating to building on top of chasms
occasionally erasing the chasm.
 2017-11-22 03:30:49 -06:00
KorPhaeron
ddddac262e Fixes blobbernaut spawning (#32954) 
* Fixes blobbernaut spawning

* There is no mob yet, we can't poll for it
 2017-11-21 22:27:49 -06:00
deathride58
51a7c4a543 Merge pull request #4057 from deathride58/manualmirrors2 
Manually mirrors #32838 and #32462 from upstream
 2017-11-21 20:00:18 +00:00
deathride58
4b284f2e0d Merge pull request #4051 from Citadel-Station-13/upstream-merge-32773 
[MIRROR] Integrated circuit fixes and code improvements
 2017-11-21 19:59:38 +00:00
deathride58
0feca054da cleans up whitespace in traitor_bro.dm 2017-11-21 14:58:43 -05:00
deathride58
973be1b494 Update traitor_bro.dm 2017-11-21 14:56:41 -05:00
deathride58
1f6b3ce629 Merge branch 'master' into upstream-merge-32188 2017-11-21 19:53:58 +00:00
deathride58
ddbb5c34d4 manual mirrors 2017-11-21 14:06:28 -05:00
ACCount
8a64287249 Integrated circuit fixes and code improvements 2017-11-21 03:04:17 -06:00
ShizCalev
35af5e49aa Fixes computers deleting on build (#32942) 
* Fixes computers deleting on build

* Removed src
 2017-11-21 02:43:34 -06:00
deathride58
c1b344f08f Merge pull request #4049 from Citadel-Station-13/upstream-merge-32860 
[MIRROR] Cleans up floors.dmi a bit and adds new turf decals.
 2017-11-21 06:42:22 +00:00
deathride58
2e210d08e1 Merge pull request #3639 from deathride58/IHAVENOIDEAWHATTHEFUCKIMDOING 
[READY] Redtext bug fix + Endround objective check cleanup
 2017-11-21 05:53:00 +00:00
deathride58
4e727ee576 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-32860 
# Conflicts:
#	_maps/map_files/MetaStation/MetaStation.dmm
 2017-11-20 23:34:46 -05:00
deathride58
d2b251d23c Merge pull request #4041 from Citadel-Station-13/upstream-merge-32844 
[MIRROR] Cleans up unused code
 2017-11-21 04:15:11 +00:00
deathride58
8249c89cc0 Merge pull request #4040 from Citadel-Station-13/upstream-merge-32905 
[MIRROR] Adds AI lawset spawners (mapping helpers)
 2017-11-21 03:25:55 +00:00
WJohn
e8ddae5d98 Cleans up floors.dmi a bit and adds new turf decals. 2017-11-20 20:48:06 -06:00
AnturK
70c7996986 Fixes abductor teams getting assigned to same pod (#32859) 
* Fixes abductors getting assigned to same team

* Remove explicit null return
 2017-11-20 19:36:10 -06:00
deathride58
05fbbaf867 Merge pull request #4036 from Citadel-Station-13/upstream-merge-32877 
[MIRROR] Allows rotating computer frames, fixes rotation on deconstruction, switches dropped materials to use drop_location()
 2017-11-20 19:08:13 +00:00
deathride58
a5ed407bc5 Merge pull request #4034 from Citadel-Station-13/upstream-merge-32890 
[MIRROR] Makes drinking glasses smash when thrown
 2017-11-20 19:07:25 +00:00
deathride58
588b76b59e Update lootdrop.dm 2017-11-20 13:57:15 -05:00
deathride58
f9b5c04cd3 Update buildandrepair.dm 2017-11-20 13:45:39 -05:00
Jordan Brown
2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
Jordan Brown
212071e075 Adds AI lawset spawners (mapping helpers) 2017-11-20 10:12:17 -06:00
ShizCalev
aea13f75cd Allows rotating computer frames, fixes rotation on deconstruction, switches dropped materials to use drop_location() 2017-11-20 03:08:10 -06:00
ShizCalev
831dde525e Makes drinking glasses smash when thrown 2017-11-20 02:45:22 -06:00
Tad Hardesty
5560a557e7 Refactor ladders so that they actually work (#32797) 2017-11-20 02:05:52 -06:00
deathride58
44287392a4 Merge pull request #4022 from Citadel-Station-13/upstream-merge-32889 
[MIRROR] Makes some turning procs consistently turn clockwise
 2017-11-20 05:48:20 +00:00
deathride58
c2864b3b8b Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into IHAVENOIDEAWHATTHEFUCKIMDOING 2017-11-20 00:21:38 -05:00
deathride58
d8e1562fcf Merge pull request #3995 from deathride58/manualsyncsreeEEEE 
Manual map syncs + manual mirrors of missed upstream map PRs
 2017-11-20 05:12:06 +00:00
deathride58
994b55c523 Merge pull request #4027 from Citadel-Station-13/upstream-merge-32864 
[MIRROR] Fixes some computer dirs
 2017-11-20 05:09:43 +00:00
deathride58
dccd2b6744 Merge pull request #4026 from Citadel-Station-13/upstream-merge-32880 
[MIRROR] Fixes vehicles & chameleon projector
 2017-11-20 05:09:08 +00:00
deathride58
344e462153 Merge pull request #4024 from Citadel-Station-13/upstream-merge-32883 
[MIRROR] Fixes tendril-related things failing to qdel because of chasm shenanigans
 2017-11-20 05:07:27 +00:00
deathride58
1356356740 Update doppler_array.dm 2017-11-20 00:05:43 -05:00
Jordie
571985ca5d Merge pull request #32864 from ike709/dir 
Fixes some computer dirs
 2017-11-19 22:42:28 -06:00
Jordie
2bf7b45919 Merge pull request #32880 from vuonojenmustaturska/chameleonprojfix 
Fixes vehicles & chameleon projector
 2017-11-19 22:39:14 -06:00
Jordie
7ca6c282f3 Merge pull request #32883 from vuonojenmustaturska/tendrilqdel 
Fixes tendril-related things failing to qdel because of chasm shenanigans
 2017-11-19 22:29:41 -06:00
Jordie
752bc654ae Makes some turning procs consistently turn clockwise 2017-11-19 22:25:17 -06:00
oranges
326c87904a Merge pull request #32876 from vuonojenmustaturska/glowshrooms 
Actually fixes the glowshroom runtime
 2017-11-19 21:24:51 -06:00
deathride58
711ca534d9 Merge pull request #4010 from Citadel-Station-13/upstream-merge-32851 
[MIRROR] Fixes suicidal blobbernauts
 2017-11-19 04:33:08 +00:00
deathride58
8c64f1cc49 Merge pull request #4006 from Citadel-Station-13/upstream-merge-32837 
[MIRROR] Fixes topic logs exposing serviceCommsKey
 2017-11-19 04:28:21 +00:00