shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,529 Commits 5 Branches 0 Tags
45e597c19a1c6857762e2cab047685aa45159eac
Commit Graph

16529 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJay 45e597c19a Merge pull request #6724 from Citadel-Station-13/upstream-merge-37673 
[MIRROR] Runtime: fixes RTG power, adjusts pipenet, adds debug chem dispensers
 2018-05-13 10:14:25 -05:00
LetterJay 28947e1c89 Merge pull request #6729 from Citadel-Station-13/upstream-merge-37792 
[MIRROR] Fixes defibs/backpack watertanks/gatling lasers
 2018-05-13 10:14:07 -05:00
LetterJay cf28aee1ee Merge pull request #6728 from Citadel-Station-13/upstream-merge-37464 
[MIRROR] Adds plasma rein glass to the ORM & adjusts material values on the various glass sheets.
 2018-05-13 10:12:28 -05:00
LetterJay 53f2fd27ca Merge pull request #6727 from Citadel-Station-13/upstream-merge-37684 
[MIRROR] Linked teleporters now teleport to the hub instead of the power station
 2018-05-13 10:12:13 -05:00
LetterJay 6230a5ee9e Merge pull request #6726 from Citadel-Station-13/upstream-merge-37737 
[MIRROR] Fixes possession funtime
 2018-05-13 10:12:00 -05:00
letterjay c6d49a1940 Fixes defibs/backpack watertanks/gatling lasers 2018-05-13 06:13:45 -05:00
YPOQ 23f6567872 Fixes defibs/watertanks/gatling lasers (#37792) 2018-05-13 06:13:45 -05:00
letterjay 6aa48c3e4a Adds plasma rein glass to the ORM & adjusts material values on the various glass sheets. 2018-05-13 06:13:37 -05:00
FrozenGuy5 e9ef82513c Add plasma rein glass to the ORM & adjusts material values on the various glass sheets (#37464) 
* Update smelting_designs.dm

* Tweaks material values on titanium glass.

* Optimizes math & fixes errors and inconsistencies
 2018-05-13 06:13:36 -05:00
letterjay 5973f855ce Linked teleporters now teleport to the hub instead of the power station 2018-05-13 06:13:27 -05:00
XDTM 5847268db3 Linked teleporters now teleport to the hub instead of the power station (#37684) 2018-05-13 06:13:27 -05:00
LetterJay 9794304626 Merge pull request #6723 from Citadel-Station-13/upstream-merge-37801 
[MIRROR] Adds wizard randomname
 2018-05-13 03:30:42 -05:00
LetterJay 156b0529e1 Merge pull request #6722 from Citadel-Station-13/upstream-merge-37797 
[MIRROR] Adds desc to chemmaster circ board
 2018-05-13 03:30:26 -05:00
LetterJay c1bbdd2f65 Merge pull request #6721 from Citadel-Station-13/upstream-merge-37752 
[MIRROR] (NOT TESTED YET) Fixes Bedbuckling to avoid Floor is Lava
 2018-05-13 03:30:15 -05:00
LetterJay 65fd97000c Merge pull request #6719 from Citadel-Station-13/upstream-merge-37707 
[MIRROR] Fixes large crates (Issue #36516)
 2018-05-13 03:29:21 -05:00
LetterJay 289cbbb375 Merge pull request #6718 from Citadel-Station-13/upstream-merge-37697 
[MIRROR] Makes the redirect component able to transfer with changeturfs
 2018-05-13 03:28:57 -05:00
LetterJay ee9e96106e Merge pull request #6717 from Citadel-Station-13/upstream-merge-37742 
[MIRROR] spellig fix
 2018-05-13 03:28:39 -05:00
LetterJay e31829a7e9 Merge pull request #6716 from Citadel-Station-13/upstream-merge-37754 
[MIRROR] family heirlooms properly open the backpack upon spawning if they're in the backpack
 2018-05-12 21:37:53 -05:00
LetterJay 646403e6e1 Merge pull request #6715 from Citadel-Station-13/upstream-merge-37772 
[MIRROR] Fixes morphs
 2018-05-12 21:37:34 -05:00
LetterJay cbfa3053ee Merge pull request #6692 from Citadel-Station-13/upstream-merge-37558 
[MIRROR] Anomaly Armour Research
 2018-05-12 21:36:51 -05:00
letterjay cbaeed3f1e Fixes possession funtime 2018-05-12 19:26:55 -05:00
AnturK 1c164ff28f Fixes possession funtime (#37737) 
* Fixes possession funtime

* This should probably be generic backend mob list but i can't think of anything else that would need it.
 2018-05-12 19:26:55 -05:00
81Denton 8463204549 Runtime: fixes RTG power, adjusts pipenet, adds debug chem dispensers 2018-05-12 18:53:59 -05:00
letterjay d3f8ad1e96 Adds wizard randomname 2018-05-12 17:54:45 -05:00
81Denton d6b945e2b7 Adds wizard randomname (#37801) 2018-05-12 17:54:45 -05:00
letterjay 2edfe8cb4b Adds desc to chemmaster circ board 2018-05-12 17:49:29 -05:00
81Denton 11d63f6a56 Adds desc to chemmaster circ board (#37797) 
* adds desc to chemmaster circ board

* ASS♂WE♂CAN♂

* don't drink and web edit kids
 2018-05-12 17:49:29 -05:00
letterjay 260958e7ae (NOT TESTED YET) Fixes Bedbuckling to avoid Floor is Lava 2018-05-12 17:44:12 -05:00
Grandmother of 50 023f93f734 Fixes Bedbuckling to avoid Floor is Lava (#37752) 
* Update floor_is_lava.dm

* Pulls the check out of the loop.
 2018-05-12 17:44:12 -05:00
LetterJay df19890da4 Merge pull request #6713 from Citadel-Station-13/upstream-merge-37774 
[MIRROR] Adds missing pixel to HoS parade uniform
 2018-05-12 17:05:07 -05:00
LetterJay 82a7a2ee2c Merge pull request #6712 from Citadel-Station-13/upstream-merge-37771 
[MIRROR] lets admins see dsay if they're in-game and unconscious
 2018-05-12 17:04:56 -05:00
LetterJay 6d5ace8227 Merge pull request #6707 from Citadel-Station-13/upstream-merge-37782 
[MIRROR] [s] Fixes an admin unprotected var read/write exploit
 2018-05-12 17:04:39 -05:00
LetterJay f21cac1af2 Merge pull request #6700 from Citadel-Station-13/upstream-merge-37399 
[MIRROR] Use spritesheets to reduce time spent sending PNG assets by 90+%
 2018-05-12 17:04:23 -05:00
letterjay c041dedf27 Fixes large crates (Issue #36516) 2018-05-12 16:41:54 -05:00
Alexch2 b0b9240466 Fixes large crates acting like lockers (#37707) 
* Fixes large crates acting like lockers

* removes forgotten comment

* Adds Cobby's suggestions, and makes the description more useful. Also improves feedback when using the wrong tool.
 2018-05-12 16:41:54 -05:00
letterjay 8d32e4ba63 Makes the redirect component able to transfer with changeturfs 2018-05-12 16:29:28 -05:00
Emmett Gaines b036b1e519 Makes the redirect component able to transfer with changeturfs (#37697) 2018-05-12 16:29:28 -05:00
letterjay bf50a3a88a spellig fix 2018-05-11 17:30:58 -05:00
Armhulen 56eab7e394 Fix spelling in mime forcefield description (#37742) 
* SPELL IT RIGHT REEEEEEEEEEEEEEEEE

* Awhile
 2018-05-11 17:30:58 -05:00
letterjay 413bf8cd58 family heirlooms properly open the backpack upon spawning if they're in the backpack 2018-05-11 17:30:49 -05:00
Iamgoofball d0a5aaa4ee family heirlooms properly open the bag upon spawning if they're in the bag (#37754) 2018-05-11 17:30:49 -05:00
letterjay 5ac4463754 Fixes morphs 2018-05-11 17:30:41 -05:00
kevinz000 9510c12065 Fixes morphs (#37772) 2018-05-11 17:30:41 -05:00
letterjay 6b0045c12a Adds missing pixel to HoS parade uniform 2018-05-11 17:30:23 -05:00
Jordan Brown 3ba00b1e9b Merge pull request #37774 from KorPhaeron/pixel 
Adds missing pixel to HoS parade uniform
 2018-05-11 17:30:23 -05:00
letterjay 8284e72e91 lets admins see dsay if they're in-game and unconscious 2018-05-11 17:30:14 -05:00
Jordan Brown ff0b19427b Merge pull request #37771 from nichlas0010/patch-1 
lets admins see dsay if they're in-game and unconscious
 2018-05-11 17:30:14 -05:00
deathride58 20ac9089a7 Merge pull request #6678 from Citadel-Station-13/upstream-merge-37710 
[MIRROR] Makes eye of god lava & fire proof
 2018-05-11 03:45:28 +00:00
deathride58 37b9d589ad Merge pull request #6679 from Citadel-Station-13/upstream-merge-37396 
[MIRROR] Track admin observer time
 2018-05-11 03:45:11 +00:00
deathride58 a980e323b9 Merge pull request #6680 from Citadel-Station-13/upstream-merge-37727 
[MIRROR] [s] Removes some stationloving-related failure surface
 2018-05-11 03:44:29 +00:00