shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,778 Commits 5 Branches 0 Tags
134201d185d4f18fa66fffca1c8a786fe99dfd7e
Commit Graph

180 Commits

Author SHA1 Message Date
deathride58
680e44fb64 Update observer.dm 2017-12-20 22:56:46 -05:00
LetterJay
6c39e94bba Update observer.dm 2017-12-19 17:56:52 -06:00
LetterJay
408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
vuonojenmustaturska
fcceb5ec77 Finishes the forceMove port 2017-12-14 15:40:08 -06:00
deathride58
dc7dd2da3c Update dead.dm 2017-12-13 12:05:09 -05:00
Jordan Brown
1bb487ebae Fixes lobby stat entries not showing 2017-12-12 15:56:38 -06:00
Jordan Brown
8b9e15d1b5 Merge pull request #33324 from deathride58/foreignfurryaddswidescreen 
[Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
 2017-12-08 10:35:23 -06:00
Cruix
b23c92b056 Added bot path data huds 2017-11-28 06:28:40 -06:00
deathride58
9e78bcd8f9 Merge pull request #3971 from Citadel-Station-13/upstream-merge-32786 
[MIRROR] Replaces a bunch of mob loops with hopefully better ones
 2017-11-18 05:29:32 +00:00
CitadelStationBot
0beef30fb7 Adds a purple bartender suit and apron, and Long Hair 3 - Requested and sprites by Okand37! (#3993) 2017-11-17 19:02:40 -08:00
vuonojenmustaturska
6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
oranges
7c45ae5cb7 Adds Extended Drill Hair 2017-11-13 03:12:44 -06:00
LetterJay
3ea8808201 Merge pull request #3673 from Citadel-Station-13/upstream-merge-32161 
[MIRROR] 512 forward compatibility merge
 2017-11-12 23:06:55 -06:00
LetterJay
6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
Jordan Brown
114936682c Merge pull request #32545 from Buggy123/patch-33 
clamps view range and add view range to a minimum of 7
 2017-11-09 23:25:23 -06:00
XDTM
d04b5cbeef Ghosts can now Health Scan (#31640) 
* Ghosts can now Health Scan

* cyberbossing

* Update observer.dm
 2017-11-02 08:46:42 -05:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
LetterJay
e150fe28b6 Merge branch 'master' into upstream-merge-31877 2017-10-28 23:57:51 -04:00
oranges
c3dbb8925b Merge pull request #31987 from Cyberboss/InlineCO 
May as well shave some yaks
 2017-10-26 05:05:09 -05:00
LetterJay
3822aa83a3 Update new_player.dm 2017-10-24 19:49:38 -05:00
LetterJay
72bd156589 Update new_player.dm 2017-10-24 18:19:49 -05:00
LetterJay
e20664dad3 Revert "Revert "[MIRROR] Late join antagonists will try to target late join players"" 2017-10-24 18:18:20 -05:00
LetterJay
aa420067ba Revert "[MIRROR] Late join antagonists will try to target late join players" 2017-10-24 00:09:11 -05:00
Jordan Brown
94826620fa Late join antagonists will try to target late join players (#31560) 2017-10-23 20:08:43 -05:00
Michiyamenotehifunana
9d52443c53 Fixes #2946 
Otusian, wolf, and skunk ears now show up on humans. Cat, Big ears now show up on mammals.
 2017-10-23 19:29:46 +08:00
LetterJay
5337b1fed2 Merge pull request #3492 from Citadel-Station-13/upstream-merge-31780 
[MIRROR] Disentangles blob from blob mode/removes blob mode
 2017-10-22 16:39:35 -04:00
CitadelStationBot
3e1c307e4e [MIRROR] Adds sports bras (#3354) 
* Adds sports bras

* Update sprite_accessories.dm

* actually add the sprites.
 2017-10-21 07:29:03 -05:00
CitadelStationBot
adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161) 
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
 2017-10-21 06:10:22 -05:00
KorPhaeron
e4f76a79a5 Allows species to be blocked from ever being roundstart, can now choose your Halloween species 2017-10-20 10:11:35 -05:00
KorPhaeron
20b17eceec Disentangles blob from blob mode/removes blob mode 2017-10-18 20:55:42 -05:00
LetterJay
e4d2609800 Merge pull request #3420 from Citadel-Station-13/upstream-merge-31665 
[MIRROR] Adds logging crew manifest to seperate file
 2017-10-16 07:28:03 -04:00
AnturK
64b1be05ff Adds logging crew manifest to seperate file (#31665) 
* Adds logging crew manifest to seperate file

* Coding blind

* i can spel words

* Not everyone in the lobby please.

* Proper header

* Fix

* Better format
 2017-10-15 16:56:48 -05:00
Armhulen
c516404175 Fixes tendril possession (#31705) 2017-10-15 11:33:24 -05:00
Emmett Gaines
55e8f6526c Radiation rework and subsystem 2017-10-13 09:22:23 -05:00
LetterJay
9af6ffa946 Merge pull request #3311 from Citadel-Station-13/upstream-merge-31543 
[MIRROR] Datumizes world/Topic
 2017-10-12 07:16:44 -04:00
Jordan Brown
1604f8b1d3 Datumizes world/Topic (#31543) 
* Datumizes world/Topic

* active_players requires comms_key
 2017-10-12 00:28:27 -05:00
deathride58
bd18903e13 eh it works 2017-10-11 18:03:58 -04:00
deathride58
5d0853e16a Crew objective/miscreant system tweaks (#3213) 
* Loadsa tweaks

* adds miscreant pref, other fixes

* fixes runtime

* fixes compiling errors for REAL now hopefully

* HOPEFULLY fixes compiling errors

* COMPILE!
 2017-10-08 10:05:40 -07:00
deathride58
39d3897b29 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants 2017-10-06 09:39:20 -04:00
Jordan Brown
f91dc76e1a Merge pull request #31310 from ShizCalev/lobby-timer-fix 
Fixes lobby timer showing as delayed when it's just waiting for more players
 2017-10-05 09:21:43 -05:00
oranges
bb9982e772 Merge pull request #31296 from ShizCalev/landmark-cleanup 
Cleans up and fixes old landmarks
 2017-10-05 03:05:40 -05:00
deathride58
5cefa71992 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants 2017-10-04 20:18:03 -04:00
Jordan Brown
cbf7ff0fc7 Dummies used for preference setup always compile overlays (#31267) 2017-10-04 11:03:47 -05:00
Augustfox
3e6ceaa9a2 Revert "Organize hair and facial hair in character creation" (#3084) 2017-10-02 23:16:51 -07:00
deathride58
70f06cfe35 config. > CONFIG_GET 2017-10-01 19:56:44 -04:00
deathride58
8e65f4fb23 Merge branch 'master' into crewobjectivesandmiscreants 2017-10-01 23:45:49 +00:00
LetterJay
6ca3deb8d1 Merge branch 'master' into upstream-merge-31129 2017-10-01 15:45:54 -04:00