shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,690 Commits 5 Branches 0 Tags
b9a2a5ce38f6fd9aeabd32f77ad2bc3544a032b2
Commit Graph
128 Commits
Author SHA1 Message Date
FermiandFermi c23d6f0113 I missed an earlier port. 2019-09-17 01:08:37 +01:00
Ghommie 12c4fc139d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151 2019-08-09 04:00:23 +02:00
Ghommie ec2a3ea778 Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception" 2019-07-31 18:56:00 +02:00
TrilbyspacecloneandGitHub a2b35d71fa port-part1 2019-07-28 08:07:44 -04:00
Ghommie b87442e633 Tones down some items attack stamina costs. kills hypereutactic blades copypasta. 2019-07-19 20:09:16 +02:00
Ghommie 129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
TrilbySpaseClone 771ac9724e ports Fel connet 
Shamelessly stealing content
 2019-06-21 04:39:10 -04:00
kevinz000andGitHub 2f2885f1d6 Merge pull request #8558 from Ghommie/Ghommie-cit35 
Ports in the container_type to reagents flags refactor.
 2019-06-08 01:26:28 -07:00
kevinz000andGitHub ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29 
Moves traits to datums and turn the accessors into defines
 2019-06-08 01:22:16 -07:00
Ghommie 7aac9e6280 Updates reagents a bit. 2019-06-07 06:27:04 +02:00
Ghommie d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Ghommie 0e630680ba forgot to pull from upstream. One second. 2019-06-06 15:20:27 +02:00
deathride58 41375d9737 Increases performance significantly by turning garbage collection into a define 2019-04-14 11:33:28 -04:00
deathride58 2c9deab42e removes add_gas() and assert_gas(). next up: do further testing with garbage_collect() present and not present 2019-04-14 10:33:39 -04:00
deathride58 8b75240d89 fuck atmos - attempts to optimize atmos by removing GAS_META from the gas mixture meta list and removing the usage of gas archive 2019-04-11 17:07:11 -04:00
Amatsu Darkfyre aedadb30a5 Fixes a difference between /tg/ and Citadel that made extracts uninjectable. 2019-03-10 23:54:45 -04:00
Amatsu Darkfyre 2d286e525d Changes Adamantine Suit's armor values to not be bad. 
Also recolors the Slime Mask so it's more obvious at a glance what it is.
 2019-03-10 15:10:07 -04:00
Amatsu Darkfyre 54a9b3206f Updates in response to feedback from Bhijn. Also adding in missed icons from my first sweep and renamed _corecross.dm to __corecross.dm. 2019-03-08 17:22:40 -05:00
Amatsu Darkfyre 575c7ebeba Adds Chilling effects to Slime Crossbreeding, along with their icons and proper DM files. Nothing is modularized, as this is all content from upstream, so there should be no upstream conflicts when or if a sync occurs. 2019-03-08 04:02:21 -05:00
deathride58andkevinz000 e6757bd39c nerfs the effects of slime speed potions on vehicles to result in movement on par with sprint speed (#8008) 2019-02-22 06:01:06 -08:00
Poojawa 284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58 b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
deathride58andGitHub a4345c8fdb Update stabilized.dm 2018-06-11 23:13:46 -04:00
deathride58andGitHub a2f1e9f47f Update _status_effects.dm 2018-06-11 23:13:11 -04:00
fludd12andletterjay c47c812fdf Fixes and Upgrades Stabilized Gold Extracts 2018-06-11 00:04:13 -05:00
LetterJayandGitHub e4eb4939b4 Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582 
[MIRROR] Makes more messages pronoun sensitive
 2018-05-23 07:46:26 -05:00
LetterJayandGitHub e7d9cd0698 Merge branch 'master' into upstream-merge-37597 2018-05-23 05:21:19 -05:00
LetterJayandGitHub 647aa4f306 Update charged.dm 2018-05-22 12:30:43 -05:00
LetterJayandGitHub 06b7cdf27a Merge branch 'master' into upstream-merge-37529 2018-05-22 08:02:46 -05:00
LetterJayandGitHub 488842a520 Update charged.dm 2018-05-22 08:01:29 -05:00
LetterJayandGitHub 5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -05:00
LetterJayandGitHub 6a575f19d1 Merge branch 'master' into upstream-merge-37597 2018-05-22 07:21:53 -05:00
LetterJayandGitHub 359d31238d Merge branch 'master' into upstream-merge-37486 2018-05-21 11:59:57 -05:00
LetterJayandGitHub 931a950adb Merge branch 'master' into upstream-merge-37486 2018-05-21 08:59:32 -05:00
LetterJayandGitHub e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -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
Tad Hardestyandletterjay 021f30f0c0 Fixed stacks sometimes having the wrong amount if created on another stack 2018-05-11 17:30:32 -05:00
deathride58andGitHub 50f8779fc0 Merge branch 'master' into upstream-merge-37486 2018-05-06 07:15:48 +00:00
deathride58andGitHub 6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
ShizCalevandCitadelStationBot b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
vuonojenmustaturskaandCitadelStationBot 0958d35b26 replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2 2018-05-02 13:14:43 -05:00
kevinz000andPoojawa 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
deathride58andGitHub f46a77ba5c Update charged.dm 2018-04-29 18:43:11 -04:00
vuonojenmustaturskaandCitadelStationBot f373b2c9e6 Kills off three more flags from flags_2 2018-04-29 17:30:55 -05:00
vuonojenmustaturskaandCitadelStationBot 3f6167d08e Moves several clothing-specific flags from /atom to their proper type 2018-04-28 13:21:48 -05:00
orangesandCitadelStationBot 7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
orangesandCitadelStationBot ce31767862 Merge pull request #37482 from vuonojenmustaturska/bluepot 
Fixes slime pressurization potion attempting to apply multiple times
 2018-04-27 08:12:10 -05:00
imsxzandCitadelStationBot e2aa213a52 BADBADBADBADBADBADBADBADBADBAD (#37452) 2018-04-27 04:14:11 -05:00
Poojawa 5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
vuonojenmustaturskaandCitadelStationBot fd521dbe1f Fixes bluespace cookie centcom exploit 2018-04-15 12:38:26 -05:00