shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,080 Commits 5 Branches 0 Tags
cb4aa936dbb0fa0c6cd2c35716e9564b60bb2c4d
Commit Graph

15080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJay
cb4aa936db Update ai.dm 2018-03-29 18:32:24 -07:00
LetterJay
002c5a2b73 ai icon 2018-03-29 18:32:24 -07:00
DavenPeace1
7bffe7110b OctopusTime 2018-03-29 18:32:05 -07:00
kevinz000
dc4b52bcfd logging (#36818) 2018-03-29 18:31:31 -07:00
CitadelStationBot
de282f5201 [MIRROR] individual player panel now logs 100% of the time (#6176) 
* individual player panel now logs 100% of the time

* logging (#36819)
 2018-03-29 17:10:37 -07:00
deathride58
77f40b6be9 Merge pull request #6093 from Michiyamenotehifunana/no-more-mk37 
Removes the Mk.37
 2018-03-27 17:53:12 +00:00
deathride58
d351caf92f Merge pull request #6130 from Citadel-Station-13/upstream-merge-36663 
[MIRROR] Slimepeople now transfer traits on body-swap, and traits now transfer correctly
 2018-03-27 17:51:35 +00:00
deathride58
e6c16ba8f8 Merge pull request #6129 from Citadel-Station-13/upstream-merge-36597 
[MIRROR] Security records consoles now uploads the center 32x32 of a photo when putting photos in
 2018-03-27 17:51:17 +00:00
deathride58
c3328968a1 Merge pull request #6128 from Citadel-Station-13/upstream-merge-36622 
[MIRROR] Fixes wormhole projectors
 2018-03-27 17:51:00 +00:00
deathride58
6bbe0d4150 Merge pull request #6126 from Citadel-Station-13/upstream-merge-36715 
[MIRROR] Replaces sniper bullets ex_act with bonus obj damage
 2018-03-27 17:49:53 +00:00
deathride58
aa415031a0 Merge pull request #6125 from Citadel-Station-13/upstream-merge-36671 
[MIRROR] Fixes machines not updating power when changing areas
 2018-03-27 17:49:35 +00:00
deathride58
c5d3bb3986 Merge pull request #6124 from Citadel-Station-13/upstream-merge-36720 
[MIRROR] Adds sanity check so you don't accidentally pop a fun balloon multiple times
 2018-03-27 17:49:13 +00:00
deathride58
be9ae841b6 Merge pull request #6123 from Citadel-Station-13/upstream-merge-36716 
[MIRROR] Adds singular_name to BS crystals
 2018-03-27 17:48:51 +00:00
deathride58
952fd00ff4 Merge pull request #6122 from Citadel-Station-13/upstream-merge-36712 
[MIRROR] Fixes pacifists being able to attack animals
 2018-03-27 17:48:31 +00:00
deathride58
f8acaf35a8 Merge pull request #6121 from Citadel-Station-13/upstream-merge-36708 
[MIRROR] removes unnecessary message
 2018-03-27 17:48:07 +00:00
deathride58
3a31833a8f Merge pull request #6120 from Citadel-Station-13/upstream-merge-36710 
[MIRROR] Properly Blacklists Mushroom People
 2018-03-27 17:47:42 +00:00
deathride58
ebc51d94bf Merge pull request #6119 from Citadel-Station-13/upstream-merge-36398 
[MIRROR] [READY]pathfinding circuitry upgrade
 2018-03-27 17:47:11 +00:00
deathride58
87600c4ff4 Merge pull request #6118 from Citadel-Station-13/upstream-merge-36509 
[MIRROR] [READY]recycler buff
 2018-03-27 17:46:23 +00:00
deathride58
34d0d456ff Merge pull request #6117 from Citadel-Station-13/upstream-merge-36697 
[MIRROR] Fixes wet floor scaling
 2018-03-27 17:45:59 +00:00
deathride58
85a621f717 Merge pull request #6113 from Citadel-Station-13/upstream-merge-36695 
[MIRROR] Fixes consoles
 2018-03-27 17:45:35 +00:00
deathride58
15472805ba Merge pull request #6055 from Poojawa/cmo-hypo-objective 
Removes the old hypospray from CMO closet, updates tator objective
 2018-03-27 17:41:44 +00:00
LetterJay
0baeeb548d Merge pull request #6094 from Citadel-Station-13/kevinz000-patch-1 
Increases arousal performance, bandaid patch
 2018-03-26 22:39:11 -05:00
CitadelStationBot
ea970d5a1d Slimepeople now transfer traits on body-swap, and traits now transfer correctly 2018-03-26 21:12:07 -05:00
Ashe Higgs
0f39d85a80 Fixes slimeperson traits (#36663) 2018-03-26 21:12:07 -05:00
CitadelStationBot
1a8cb54e45 Security records consoles now uploads the center 32x32 of a photo when putting photos in 2018-03-26 21:04:48 -05:00
kevinz000
40776d5ee5 Security records consoles now uploads the center 32x32 of a photo when putting photos in (#36597) 
* Sec console centering photos

* Update security.dm

* whoever coded this before me is triple meme
 2018-03-26 21:04:48 -05:00
CitadelStationBot
bdd2c241cc Fixes wormhole projectors 2018-03-26 17:19:46 -05:00
kevinz000
f8697faf8f Fixes wormhole projectors (#36622) 2018-03-26 17:19:46 -05:00
CitadelStationBot
e9019c9cdf Replaces sniper bullets ex_act with bonus obj damage 2018-03-26 17:17:23 -05:00
XDTM
3d36b34650 Replaces sniper bullets ex_act with bonus obj damage (#36715) 
* Replaces sniper bullets ex_act with bonus obj damage

* Update sniper.dm

* Update sniper.dm
 2018-03-26 17:17:23 -05:00
CitadelStationBot
f2bb339c03 Fixes machines not updating power when changing areas 2018-03-26 14:25:06 -05:00
Jordan Brown
ed6fae603e Merge pull request #36671 from YPOQ/areachangepowerfix 
Fixes machines not updating power when changing areas
 2018-03-26 14:25:06 -05:00
CitadelStationBot
e526cfb8c2 Adds sanity check so you don't accidentally pop a fun balloon multiple times 2018-03-26 14:22:53 -05:00
Dax Dupont
46976c4cab Adds sanity check so you don't accidentally pop a fun balloon multiple times (#36720) 
* Adds sanity check so you don't accidentally pop a fun balloon multiple times.

* Fuck it, probably better like this

* heck
 2018-03-26 14:22:53 -05:00
CitadelStationBot
ee575f1336 Adds singular_name to BS crystals 2018-03-26 14:21:36 -05:00
Jordan Brown
35f0fe9676 Merge pull request #36716 from 81Denton/bscrystalname 
Adds singular_name to BS crystals
 2018-03-26 14:21:36 -05:00
CitadelStationBot
c057bfcf11 Fixes pacifists being able to attack animals 2018-03-26 14:19:23 -05:00
Jordan Brown
08569ff906 Merge pull request #36712 from XDTM/NoPunchingIan 
Fixes pacifists being able to attack animals
 2018-03-26 14:19:23 -05:00
CitadelStationBot
c3459ea022 removes unnecessary message 2018-03-26 14:18:12 -05:00
Jordan Brown
d6a5f2c831 Merge pull request #36708 from Armhulen/patch-66 
removes unnecessary message
 2018-03-26 14:18:12 -05:00
CitadelStationBot
3bd16c49c2 Properly Blacklists Mushroom People 2018-03-26 14:18:03 -05:00
Jordan Brown
98b308279f Merge pull request #36710 from fludd12/Inky-Capped-Lists 
Properly Blacklists Mushroom People
 2018-03-26 14:18:03 -05:00
CitadelStationBot
ff6b7866bb [READY]pathfinding circuitry upgrade 2018-03-26 11:01:23 -05:00
arsserpentarium
303272319a [READY]pathfinding circuitry upgrade (#36398) 
* all in one

* fixfixfix

* uhhhh

* demuxdemuxdemuxdemux

* wire eriw

* icon noci

* tihsxifixshit

* rewopower

* fixif

* screeneercs

* returnruter
 2018-03-26 11:01:22 -05:00
CitadelStationBot
fc978692f5 [READY]recycler buff 2018-03-26 10:54:04 -05:00
arsserpentarium
febcc648af [READY]recycler buff (#36509) 
* recycler

* runtimemitnur

* mkay
 2018-03-26 10:54:04 -05:00
CitadelStationBot
cd62983c23 Fixes wet floor scaling 2018-03-26 10:49:42 -05:00
kevinz000
4773743eab Fixes wet floor scaling (#36697) 
* Fixes wet floor scaling

* Meh lets not
 2018-03-26 10:49:42 -05:00
Poojawa
c579d81f4c Vore fixes and a few additions (#6032) 
* Fixes saving memes, Adds absorbing and OOC escape

Also allows for people to reload from a slot if they fuck up and delete a belly

* makes sure travis won't flip the fuck out

* fixes some sound issues

* cleaning up some extra sounds, also dragon vore sound settings

* fixes resisting out of guts

* BRACKETS

* Prey now become blind after being eaten.

Use the audible subtle message to continue roleplaying with them!

* Actually make bulges show up in examine

* Fixes cases where transfering between bellies would blind twice

Because, y'know, that make sense. Also added self reminders if any changes happen to JSONs
 2018-03-26 04:46:50 -05:00
CitadelStationBot
bf63fa766a [MIRROR] Adds sync to tgdb button for permission panel (#6086) 
* Merge pull request #36413 from Jordie0608/ifyoupressthisbuttonthreetimesatmidnighttheghostoferroragewillstealyourholder

Adds sync to tgdb button for permission panel

* Adds sync to tgdb button for permission panel
 2018-03-26 04:40:12 -05:00