shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,372 Commits 5 Branches 0 Tags
6541ea749c263c5f53314cbf842cb8cd09d4b663
Commit Graph
4372 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBotandkevinz000 6541ea749c Fixes midi2piano (#2433) 2017-08-19 18:59:35 -07:00
LetterJayandGitHub 9da30ff9f3 Merge pull request #2427 from Citadel-Station-13/upstream-merge-29997 
[MIRROR] readds toggle_hear_radio admin verb
 2017-08-19 12:25:14 -05:00
CitadelStationBot da6e3d7c8e readds toggle_hear_radio admin verb 2017-08-19 06:45:50 -05:00
LetterJayandGitHub e8af537064 Merge pull request #2424 from Citadel-Station-13/upstream-merge-29968 
[MIRROR] Makes mixing meth dangerous again
 2017-08-18 22:44:08 -05:00
LetterJayandGitHub 7296191a1b Merge pull request #2423 from Citadel-Station-13/upstream-merge-29899 
[MIRROR] Adds a warning to the traitor panel for the last headrev
 2017-08-18 22:43:49 -05:00
CitadelStationBot f7bde6a76a Makes mixing meth dangerous again 2017-08-18 18:59:58 -05:00
CitadelStationBot 45d6ece7a8 Adds a warning to the traitor panel for the last headrev 2017-08-18 18:57:53 -05:00
CactusandGitHub ad8af9f9ec fixes shark tail color 
husky ears moved to extra instead of inner, in line with wolf ears
 2017-08-18 17:27:07 -04:00
CactusandGitHub 61d7ad4e82 Stylesheet and Wolves (#2389) 
* organizes the mam_bodyparts file by species

* Revert "organizes the mam_bodyparts file by species"

This reverts commit ab692973ba20c282becf0d69514b1ac03d5447f8.

* stylesheet fix

* wolf sprite edits

* conflict resolution

* wolf accessories readded
 2017-08-18 15:35:08 -04:00
LetterJayandGitHub 85a10be496 Merge pull request #2221 from Citadel-Station-13/upstream-merge-29523 
[MIRROR] Makes GetComponent() faster using typecache magic
 2017-08-18 14:16:44 -05:00
LetterJayandGitHub 2c33ef3ab0 Update component.dm 2017-08-18 13:56:47 -05:00
CitadelStationBot b4431f3840 Automatic changelog generation for PR #2362 [ci skip] 2017-08-18 13:41:38 -05:00
LetterJayandGitHub 95cbe66a3a Merge pull request #2362 from Citadel-Station-13/upstream-merge-29870 
[MIRROR] Fixes a typo in the blobbernaut spawn text
 2017-08-18 13:41:37 -05:00
LetterJayandGitHub 6dd7c44bbc Merge pull request #2361 from Citadel-Station-13/upstream-merge-29829 
[MIRROR] Merges the two turf/Entereds
 2017-08-18 13:41:23 -05:00
LetterJayandGitHub 19b8a5a380 Merge pull request #2352 from Citadel-Station-13/upstream-merge-29858 
[MIRROR] Fixed sign description
 2017-08-18 13:41:07 -05:00
LetterJayandGitHub f378f66705 Merge pull request #2347 from Citadel-Station-13/upstream-merge-29794 
[MIRROR] Removes chat pings from href logs
 2017-08-18 11:27:13 -05:00
LetterJayandGitHub 094c4847f7 Merge pull request #2355 from Citadel-Station-13/upstream-merge-29849 
[MIRROR] More baseturf helpers
 2017-08-18 11:26:53 -05:00
LetterJayandGitHub 8a7c0e657f Update powers.dm 2017-08-18 11:20:36 -05:00
LetterJayandGitHub db3622ca12 Update signs.dm 2017-08-18 11:18:33 -05:00
LetterJayandGitHub 3c91fba8e3 Update turf.dm 2017-08-18 11:16:30 -05:00
LetterJayandGitHub 79c44b053d Merge branch 'master' into upstream-merge-29794 2017-08-18 11:14:45 -05:00
LetterJayandGitHub 7ab92ade3c Update lavaland_surface_xeno_nest.dmm 2017-08-18 11:13:45 -05:00
LetterJayandGitHub 146b5880d5 Merge pull request #2410 from Citadel-Station-13/upstream-merge-29934 
[MIRROR] Fixes leathercrafting recipies trying to build on the floor.
 2017-08-17 10:09:16 -05:00
LetterJayandGitHub 327214c299 Merge pull request #2409 from Citadel-Station-13/upstream-merge-29945 
[MIRROR] Improves attack logging of pulling / grabbing / throwing
 2017-08-17 10:09:01 -05:00
CitadelStationBot 3b55852c5e Automatic changelog generation for PR #2408 [ci skip] 2017-08-17 10:08:14 -05:00
LetterJayandGitHub 848fbc4251 Merge pull request #2408 from Citadel-Station-13/upstream-merge-29948 
[MIRROR] The station explosion cinematic now uses the old "far explosion" sound
 2017-08-17 10:08:13 -05:00
CitadelStationBot 51a615f5c6 Automatic changelog generation for PR #2399 [ci skip] 2017-08-17 10:07:39 -05:00
LetterJayandGitHub c32595f980 Merge pull request #2399 from Citadel-Station-13/upstream-merge-29820 
[MIRROR] Blobs can now sense loving cuddles!
 2017-08-17 10:07:37 -05:00
LetterJayandGitHub e44a70c135 Merge pull request #2396 from Citadel-Station-13/upstream-merge-29797 
[MIRROR] Moves most of world.dm
 2017-08-17 10:07:06 -05:00
LetterJayandGitHub 8ab87aa0bd Merge pull request #2403 from Citadel-Station-13/upstream-merge-29943 
[MIRROR] New telecomm sprites
 2017-08-17 10:06:47 -05:00
CitadelStationBot 72cf7083f6 Fixes leathercrafting recipies trying to build on the floor. 2017-08-17 09:19:09 -05:00
CitadelStationBot 2a2e4b2af4 Improves attack logging of pulling / grabbing / throwing 2017-08-17 09:19:05 -05:00
CitadelStationBot 0c957efee1 The station explosion cinematic now uses the old "far explosion" sound 2017-08-17 09:18:58 -05:00
CitadelStationBot 2b144561e1 Automatic changelog generation for PR #2402 [ci skip] 2017-08-16 21:50:13 -05:00
LetterJayandGitHub 1e05fd790f Merge pull request #2402 from Citadel-Station-13/upstream-merge-29931 
[MIRROR] Changes smes, cells, cell charger, terminals and apcs icons
 2017-08-16 21:50:12 -05:00
CitadelStationBot 5a1123e09b New telecomm sprites 2017-08-16 21:05:49 -05:00
CitadelStationBot 68830dac71 Changes smes, cells, cell charger, terminals and apcs icons 2017-08-16 20:02:24 -05:00
LetterJayandGitHub a2e9480cff Update world.dm 2017-08-16 19:40:40 -05:00
LetterJayandGitHub 6f1b78e12c Merge pull request #2395 from Citadel-Station-13/upstream-merge-29937 
[MIRROR] [s] Fixes MG turret firing while the user is stunned/cuffed/unconscious
 2017-08-16 19:35:22 -05:00
LetterJayandGitHub 60f4d552da Merge pull request #2398 from Citadel-Station-13/upstream-merge-29912 
[MIRROR] Removes meth explosion syringes
 2017-08-16 19:34:51 -05:00
LetterJayandGitHub b1fef14cec Merge pull request #2397 from Citadel-Station-13/upstream-merge-29688 
[MIRROR] Nerfs L6 SAW Hollow Point Bullets from -10 armour penetration to -60 armour penetration.
 2017-08-16 19:34:26 -05:00
LetterJayandGitHub 057bed7863 Merge pull request #2394 from Citadel-Station-13/upstream-merge-29930 
[MIRROR] Removes out of date colon operator log
 2017-08-16 19:34:10 -05:00
LetterJayandGitHub 865d16b3b4 Merge pull request #2392 from sirelgate/master 
Fixing weird 'hook' from icon missmatch from side arm
 2017-08-16 19:33:50 -05:00
Haresay 4bf8bd8eaa Merge branch 'master' of https://github.com/sirelgate/Citadel-Station-13 2017-08-16 17:25:57 -06:00
Haresay 27d466bda4 handsidefix 2017-08-16 17:25:55 -06:00
CitadelStationBot 4bd5e318c2 Blobs can now sense loving cuddles! 2017-08-16 18:00:54 -05:00
CitadelStationBot 9176bbc129 Removes meth explosion syringes 2017-08-16 17:59:48 -05:00
CitadelStationBot e5b7eefffe Nerfs L6 SAW Hollow Point Bullets from -10 armour penetration to -60 armour penetration. 2017-08-16 17:53:39 -05:00
CitadelStationBot afbe4be50c Moves most of world.dm 2017-08-16 17:51:33 -05:00
CitadelStationBot c2d335b7da [s] Fixes MG turret firing while the user is stunned/cuffed/unconscious 2017-08-16 17:50:28 -05:00