shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,831 Commits 5 Branches 0 Tags
c27d97a6e58415716d2ebd5c49d6f2e9926658ab
Commit Graph
1156 Commits
Author SHA1 Message Date
LetterJayandGitHub 6489ef5511 Merge pull request #6550 from Citadel-Station-13/upstream-merge-37476 
[MIRROR] Uppercases slot defines.
 2018-05-21 11:23:02 -05:00
LetterJayandGitHub 207c022f87 Merge pull request #6825 from Citadel-Station-13/upstream-merge-37954 
[MIRROR] Refresh mob views when atoms enter/exit storage
 2018-05-21 08:29:46 -05:00
Tad Hardestyandletterjay 9b4b9b4f34 Refresh mob views when atoms enter/exit storage (#37954) 2018-05-21 04:46:20 -05:00
Nichandletterjay 177139a1d3 Replace nauseous with nauseated (#37927) 2018-05-21 03:06:39 -05:00
LetterJayandGitHub 0758204515 Merge branch 'master' into upstream-merge-37476 2018-05-20 23:12:07 -05:00
LetterJay ea9b3622fd Merge branch 'master' into upstream-merge-37476 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2018-05-20 23:11:16 -05:00
LetterJayandGitHub a0b6b4e7d8 Update _trait.dm 2018-05-20 04:30:25 -05:00
deathride58andGitHub 649314c455 Merge pull request #6682 from Citadel-Station-13/upstream-merge-37429 
[MIRROR] Update DMAPI to version 3.2.1.0
 2018-05-17 18:14:54 +00:00
LetterJayandGitHub 8efc7711a7 Merge branch 'master' into upstream-merge-37423 2018-05-16 12:17:57 -05:00
LetterJayandGitHub 0877bdd4e5 Merge pull request #6663 from Citadel-Station-13/upstream-merge-37646 
[MIRROR] Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code
 2018-05-15 00:47:59 -05:00
Barhandarandletterjay bcd2b0a3b0 Replaces adding goliath plates to clothing and APLUs with a customizable tracking component (#37525) 
add: Amount of goliath plates is now shown in examine for explorer suits and mining hardsuits.


I was peeved by being unable to tell whether the armour is upgraded or not except by trying to stick more plates on it.

I think a more correct way would be to add a plate amount var to these items similarly to APLU plating and then have description mention their amount and, for added transparency, that it's possible to improve it if there's 0 plates.

Please point the errors/wrongs in it, since "current armour value minus constant divided by value each plate adds" is rather clunky code.
 2018-05-13 18:55:56 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub e164668c5e Update negative.dm 2018-05-12 21:37:26 -05:00
Grandmother of 50andletterjay 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
Emmett Gainesandletterjay b036b1e519 Makes the redirect component able to transfer with changeturfs (#37697) 2018-05-12 16:29:28 -05:00
Iamgoofballandletterjay d0a5aaa4ee family heirlooms properly open the bag upon spawning if they're in the bag (#37754) 2018-05-11 17:30:49 -05:00
deathride58andGitHub 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
deathride58andGitHub b38424653c Merge pull request #6703 from Citadel-Station-13/upstream-merge-37656 
[MIRROR] Fixes EMPs not working on people/backpacks/other storage being carried on people
 2018-05-11 03:36:01 +00:00
Jordan Brownandletterjay ed41769e10 Merge pull request #37761 from MrStonedOne/patch-503 
Adds time_dilation info to status topic.
 2018-05-10 15:50:59 -05:00
kevinz000andletterjay 3819a5a9b5 Fixes EMPs (#37656) 2018-05-10 01:33:25 -05:00
XDTMandletterjay ec3516ea19 [s] Hallucinations 4.0 2018-05-09 16:15:58 -05:00
Jordan Brownandletterjay 1a25c685a1 Update DMAPI to version 3.2.1.0 2018-05-08 21:33:58 -05:00
vuonojenmustaturskaandletterjay 003eced6af [s] Removes some stationloving-related failure surface (#37727) 
COMSIG_TRY_STORAGE_TAKE fails, leaving the disk out-of-bounds. forceMove HAS to be good enough here.
 2018-05-08 16:40:56 -05:00
deathride58andGitHub 5d38c10581 Merge pull request #6661 from Citadel-Station-13/upstream-merge-37712 
[MIRROR] Fixes a radiation runtime related to going off the map edge
 2018-05-07 12:46:00 +00:00
deathride58andGitHub 9b7518e1e2 Merge pull request #6665 from Citadel-Station-13/upstream-merge-37578 
[MIRROR] Fix the top menus in the skin not working
 2018-05-07 12:44:35 +00:00
deathride58andGitHub 034bf6ce79 Update verbs.dm 2018-05-06 17:38:25 -04:00
vuonojenmustaturskaandCitadelStationBot 0d7a0c0418 Merge pull request #37679 from DaxDupont/death 
Fixes rhumba beat as requested by naksu
 2018-05-06 16:38:16 -05:00
Tad HardestyandCitadelStationBot af5e898dab Fix the top menus in the skin not working 2018-05-06 16:37:31 -05:00
orangesandCitadelStationBot e0412f6325 Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code 2018-05-06 16:37:13 -05:00
Jordan BrownandCitadelStationBot 56e9fcd29c Merge pull request #37712 from ninjanomnom/dont-step-off-the-edge 
Fixes a radiation runtime related to going off the map edge
 2018-05-06 16:36:54 -05:00
deathride58andGitHub 6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
LetterJayandGitHub 4dd07fe4e7 Merge pull request #6641 from Citadel-Station-13/upstream-merge-37447 
[MIRROR] Fixes mousetraps not going off from being dumped out
 2018-05-05 09:38:11 -05:00
LetterJayandGitHub 889716fbd6 Merge pull request #6645 from Citadel-Station-13/upstream-merge-37640 
[MIRROR] Lengthen commit hashes in Show Server Revision
 2018-05-05 09:35:31 -05:00
LetterJayandGitHub 908394f1e2 Merge pull request #6640 from Citadel-Station-13/upstream-merge-37432 
[MIRROR] Fixes Several Machines Materials Insertion
 2018-05-04 22:57:32 -05:00
CitadelStationBotandGitHub 7bab794c6b Merge pull request #6627 from Citadel-Station-13/upstream-merge-37455 
[MIRROR] deadly brain tumor now gives -3 points
 2018-05-04 22:47:13 -05:00
Jordan BrownandCitadelStationBot 1aa0091ec1 Merge pull request #37640 from AutomaticFrenzy/patch/server-revision 
Lengthen commit hashes in Show Server Revision
 2018-05-04 08:42:44 -05:00
kevinz000andCitadelStationBot 4a7fae664e Fixes mousetraps not going off from being dumped out (#37447) 
* mousetrap fix

* fix mousetraps

* Update storage.dm

* Combine checks
 2018-05-04 04:43:12 -05:00
Fox McCloudandCitadelStationBot f5031bc4f7 Fixes Several Machines Materials Insertion (#37432) 
* Fixes Several Machines Materials Insertion

* attackby disable and show on examine fix
 2018-05-04 04:40:56 -05:00
deathride58 288c61b1c1 obfuscates the gamemode in topic() calls 2018-05-03 21:14:15 -04:00
ArmhulenandCitadelStationBot fa6292dbd5 deadly brain tumor now gives -3 points (#37455) 
* i can tweak it if need be yadda yadda one line change

* ok lets be SENSIBLE.
 2018-05-02 21:24:26 -05:00
deathride58andGitHub 55566461c6 Merge pull request #6601 from Citadel-Station-13/upstream-merge-37565 
[MIRROR] Modifies component transfer to make ChangeTurf able to transfer components
 2018-05-02 13:59:14 +00:00
deathride58andGitHub f35bfa22e4 Merge pull request #6614 from Citadel-Station-13/upstream-merge-37475 
[MIRROR] H.O.G.A.N. lawset
 2018-05-02 01:33:19 +00:00
deathride58andGitHub 5c40a38457 Merge pull request #6609 from Citadel-Station-13/upstream-merge-37584 
[MIRROR] Readds missing nuked narsie cinematic.
 2018-05-02 01:30:19 +00:00
deathride58andGitHub f248685db2 Merge pull request #6607 from Citadel-Station-13/upstream-merge-37579 
[MIRROR] Fix placing boxes in storage implants
 2018-05-02 01:29:41 +00:00
deathride58andGitHub 613fadf057 Update _concrete.dm 2018-05-01 21:27:01 -04:00
deathride58andGitHub d26ba53e91 Merge pull request #6596 from Citadel-Station-13/upstream-merge-37513 
[MIRROR] Adds traits for a character's preference towards pineapples.
 2018-05-02 01:25:04 +00:00
deathride58andGitHub 4851b9bd82 Merge pull request #6559 from Citadel-Station-13/upstream-merge-37501 
[MIRROR] Fixes missing icons
 2018-05-02 01:19:58 +00:00
deathride58andGitHub e26f1cd78b Merge pull request #6553 from Citadel-Station-13/upstream-merge-37165 
[MIRROR] NTNet improvements!
 2018-05-02 01:17:10 +00:00
deathride58andGitHub e8f4602716 Update implant.dm 2018-05-01 21:16:05 -04:00