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

293 Commits

Author SHA1 Message Date
LetterJay
b89254ced7 Merge pull request #6807 from Citadel-Station-13/upstream-merge-37448 
[MIRROR] [READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT
 2018-05-24 11:58:57 -05:00
LetterJay
d19ecc5a4f Update magweapon.dm 2018-05-24 11:21:33 -05:00
LetterJay
e79113faca Update all_nodes.dm 2018-05-24 11:21:04 -05:00
deathride58
99d78cb07a Merge branch 'master' into poojgoneplzrevert 2018-05-24 03:28:39 +00:00
deathride58
be4902d195 tones down particle defender stamloss (#6761) 2018-05-23 12:15:58 -07:00
deathride58
5f60f30700 Adds custom say verbs, makes yelling echo and penetrate walls, makes distant voices have small text (#6615) 
* adds custom say emotes, makes yelling penetrate walls and echo throughout areas

* Update say.dm

* Update say.dm

* Update say.dm

* Update mob.dm

* makes yelling unable to penetrate space
 2018-05-23 12:14:18 -07:00
LetterJay
42dd419f80 Update eutactic_blades.dm 2018-05-23 05:42:31 -05:00
LetterJay
e4c8e1b416 Update eutactic_blades.dm 2018-05-22 09:29:23 -05:00
LetterJay
06b7cdf27a Merge branch 'master' into upstream-merge-37529 2018-05-22 08:02:46 -05:00
LetterJay
a610e635f1 Update ids.dm 2018-05-22 08:00:04 -05:00
LetterJay
e415aac87a missed one 2018-05-21 08:38:09 -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
LetterJay
1e207a7430 modular_citadel 2018-05-20 23:04:13 -05:00
LetterJay
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
deathride58
b501677999 fuck 2018-05-14 19:48:45 -04:00
deathride58
799cc77f72 Emag QoL and addition of emag recharging 2018-05-14 19:05:38 -04:00
LetterJay
a98e1387c1 trait => quirk 2018-05-14 12:31:49 -05:00
LetterJay
4fcca6ea4c Update custom_items.dm 2018-05-13 07:26:57 -05:00
LetterJay
38628753d1 Update __donator.dm 2018-05-13 07:26:44 -05:00
LetterJay
1e84547584 Update custom_items.dm 2018-05-13 07:26:15 -05:00
LetterJay
1a1341989d labcat thingy 2018-05-13 07:06:27 -05:00
LetterJay
1fbc06234f Update __donator.dm 2018-05-05 07:24:37 -05:00
LetterJay
bbebcc85e7 Update __donator.dm 2018-05-05 07:23:33 -05:00
deathride58
184441eb38 Merge pull request #6078 from Commandersand/LOADOUT 
MORE LOADOUT STUFF
 2018-05-02 17:29:44 +00:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
deathride58
ab3c55ab23 replaces randomized wires with departmental wires (#6376) 2018-04-27 07:42:09 -07:00
deathride58
d2fbb671ba Removes ADS + other combat mode tweaks, makes adjuststaminabuffer() affect borg cells, adds sprinting for borgs (#6498) 
* adjuststaminabuffer() now drains borg cells, borgs can now sprint, removes aiming down sights, combat mode now makes you face your cursor

* forgot to ctrl+s here
 2018-04-27 07:41:31 -07:00
deathride58
4702d0232e Merge pull request #6465 from Michiyamenotehifunana/polychromicdonators-Wave2 
Wave 2 of exclusive polychromic clothes
 2018-04-27 09:47:16 +00:00
deathride58
ddd9d670d3 Merge pull request #6484 from DravenPeace1/Branch-2 
Branch 2
 2018-04-27 09:45:53 +00:00
deathride58
c92d4da83d Merge pull request #6519 from Poojawa/snowflake-protection 
Fixes shitcode in slime code
 2018-04-27 09:37:11 +00:00
Poojawa
918e4c50eb ensures tails reset taur mode 2018-04-26 07:37:49 -05:00
Poojawa
110878de18 Update jellypeople.dm 2018-04-26 07:27:47 -05:00
Poojawa
f29859ddbd fixes my shitcode 2018-04-26 07:27:09 -05:00
Poojawa
95e3a2b266 Fixes shitcode 2018-04-26 07:14:42 -05:00
Poojawa
0d5d992732 compile fixes + initial map port 2018-04-23 03:37:10 -05:00
Poojawa
832f071b59 mob stuff 2018-04-23 02:26:53 -05:00
DavenPeace1
5fb1eddec9 Even more extras! 2018-04-23 03:40:13 -03:00
LetterJay
3044f3ad3a Merge pull request #6468 from Poojawa/teleport-code-reee 
Fixes teleportation bugs with cryopods and vore
 2018-04-22 22:23:49 -05:00
Poojawa
09b14dfbea Fixes teleportation bugs with cryopods and vore 2018-04-21 22:53:24 -05:00
Michiyamenotehifunana
6a2b8bca3f Dumps in a bunch of donator exclusive polychromes 2018-04-20 17:34:59 +08:00
DavenPeace1
f5e07db1b5 More extras! 2018-04-18 23:56:43 -03:00
deathride58
5f37b59107 on second thought, the cell usage change is a little dumb, the stamloss per watt isnt much different from its original value 2018-04-17 22:32:25 -04:00
deathride58
521cc43664 makes pump-disabler slug slightly more cell-efficient than pump-disabler spread 2018-04-17 21:26:00 -04:00
deathride58
9678de1f2f the fuck are these numbers 2018-04-17 21:17:54 -04:00
LetterJay
b3f42dce0b Update __donator.dm 2018-04-15 21:56:02 -05:00
Chayse Ramsay
58111c6482 Fixing slimepeople (#6386) 2018-04-12 08:39:44 -07:00
deathride58
4b87170139 Adds "Man up" verb for admins. (#6296) 
* adds man up verb

* Update admin_verbs.dm

* adds man up global

* blech
 2018-04-10 17:34:45 -07:00
LetterJay
33d6ee9f96 Update __donator.dm 2018-04-10 11:54:50 -05:00
Michiyamenotehifunana
4c86571f9a Preliminary polish and implementation of exclusive polychromics 2018-04-10 22:56:16 +08:00
deathride58
e0d7630c19 Merge branch 'master' into synctesting 2018-04-09 21:43:26 +00:00