shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
900 Commits 5 Branches 0 Tags
dbaca1843d2f6feb7501a9ed2b982cccd39de2c8
Commit Graph

201 Commits

Author SHA1 Message Date
LetterJay
dbaca1843d Merge pull request #570 from Citadel-Station-13/upstream-merge-26539 
[MIRROR] The blood loss change everyone's been raving about
 2017-04-26 06:30:00 -05:00
LetterJay
417b80bb42 Merge pull request #516 from Verkister/master 
Bringing back the dogborgos.
 2017-04-26 06:24:26 -05:00
CitadelStationBot
5f09fa4de8 The blood loss change everyone's been raving about 2017-04-25 23:13:45 -05:00
LetterJay
f70e00d8cd Merge pull request #531 from Citadel-Station-13/upstream-merge-26441 
[MIRROR] Plasmamen tongues, plasmaman lung sprites
 2017-04-25 22:00:26 -05:00
LetterJay
73456c9e9a REJECT CLEANUP. FUUUUUUUUUUUUUUUUUUCK. 2017-04-25 21:40:46 -05:00
LetterJay
6dc70fc02f Merge pull request #526 from Citadel-Station-13/upstream-merge-26289 
[MIRROR] Changed alternate appearances to  /datum/atom_hud s
 2017-04-25 21:39:14 -05:00
LetterJay
feb3569d13 mob.dm manual merge 2017-04-25 21:25:08 -05:00
LetterJay
993bea0342 Merge pull request #560 from Citadel-Station-13/upstream-merge-26480 
[MIRROR] Piggybacking on humans now takes a 1.5 second delay before you actually grab on
 2017-04-25 21:16:01 -05:00
LetterJay
213799bfc3 Merge pull request #558 from Citadel-Station-13/upstream-merge-26522 
[MIRROR] Fixes alien spit visual not disappearing
 2017-04-25 20:34:30 -05:00
LetterJay
6fa7305e27 Delete slime.dm.rej 2017-04-25 20:33:07 -05:00
LetterJay
b8ed1fc43e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-04-25 20:27:20 -05:00
LetterJay
0a77dfcce5 manual merge for slime.dm 2017-04-25 20:23:00 -05:00
LetterJay
fd26d0eccd Merge pull request #555 from Citadel-Station-13/upstream-merge-26501 
[MIRROR] Small abductors refactor
 2017-04-25 20:10:20 -05:00
LetterJay
2362b1ff46 Merge pull request #543 from Citadel-Station-13/upstream-merge-26456 
[MIRROR] fixes people with no skin/golems dropping skin when gibbed
 2017-04-25 20:07:26 -05:00
CitadelStationBot
441efa81ca Piggybacking on humans now takes a 1.5 second delay before you actually grab on 2017-04-25 13:47:26 -05:00
CitadelStationBot
62348f9049 Fixes alien spit visual not disappearing 2017-04-25 09:36:23 -05:00
CitadelStationBot
fb61c31470 Small abductors refactor 2017-04-25 03:59:08 -05:00
CitadelStationBot
d931e5801c A bunch of Initialize()s now have return values 2017-04-25 03:51:57 -05:00
LetterJay
8088ce38cc rej file cleanup 2017-04-25 01:15:04 -05:00
LetterJay
a06c6a2994 Merge pull request #508 from Citadel-Station-13/upstream-merge-26337 
[MIRROR] Refactors picture frames to use wall frames system
 2017-04-25 01:10:40 -05:00
LetterJay
de1d8188ae removes rej files 2017-04-24 21:34:58 -05:00
LetterJay
88da83f504 Merge pull request #542 from Citadel-Station-13/upstream-merge-26416 
[MIRROR] Ghosts no longer drift in space
 2017-04-24 21:31:32 -05:00
CitadelStationBot
08a8f8d757 Getting uncuffed resets your clickdelay 2017-04-24 18:09:17 -05:00
CitadelStationBot
a39a405b60 fixes people with no skin/golems dropping skin when gibbed 2017-04-24 17:59:57 -05:00
CitadelStationBot
ffc35f33ba Ghosts no longer drift in space 2017-04-24 17:53:49 -05:00
CitadelStationBot
cc50235a0f Fixes some facehugger bugs 2017-04-24 17:40:31 -05:00
LetterJay
4833a8e044 Merge pull request #529 from Citadel-Station-13/upstream-merge-26346 
[MIRROR] Braining/debraining fixes
 2017-04-24 16:46:50 -05:00
CitadelStationBot
f3b196e55d Plasmamen tongues, plasmaman lung sprites 2017-04-24 04:06:35 -05:00
CitadelStationBot
de50b582ae Braining/debraining fixes 2017-04-23 14:48:31 -05:00
CitadelStationBot
f58335d5d8 Fixes swarmers speaking common 2017-04-23 13:53:36 -05:00
CitadelStationBot
387caa518f Changed alternate appearances to /datum/atom_hud s 2017-04-23 13:26:08 -05:00
Verkister
a6341f4cab Couldn't find the reset module in the code, but added something that should fix offset and icon directory for standard borg in case it gets borked from un-dogborging. 2017-04-23 10:11:42 +03:00
Verkister
d66e609d48 Bringing back the dogborgos. 
-Also replaced the offset breaking forth-reset attack anim with forth-back as I did last time.
-Dogborg pounce is currently broken and slapping people with hud icons may be harmful for immursions.
-No Borgi yet because I can't be arsed to readd the whole sprite set this tired.
 2017-04-23 02:36:31 +03:00
LetterJay
0db0c55ade Merge pull request #507 from Citadel-Station-13/upstream-merge-26408 
[MIRROR] Conveyor movement refactor/fix
 2017-04-22 14:36:22 -05:00
CitadelStationBot
05d8550771 Refactors picture frames to use wall frames system 2017-04-21 17:54:34 -05:00
CitadelStationBot
1a93abc66e Conveyor movement refactor/fix 2017-04-21 17:28:09 -05:00
CitadelStationBot
a975a35f92 Fixes languages being understood over radio 2017-04-21 17:24:59 -05:00
Squi-RL
fc1fd4b72b Acorn hologram & bug fix for eevee tails (#471) 
* Edited Eevee wag code

fixes the issue where the tail tip color disappears while wagging

* Adds an acorn hologram

as the title says, adds an acorn hologram... it's animated too!

* Adds code to support the Acorn

allows an AI to select "acorn" from the unique hologram catagory
 2017-04-20 22:05:17 -05:00
Poojawa
f866139c52 Admin ticket tgstyle (#493) 
* some porting

* other changes
 2017-04-20 22:00:47 -05:00
LetterJay
de2d0985c4 Merge pull request #440 from Citadel-Station-13/upstream-merge-26134 
[MIRROR] Refactors dbcon into a subsystem
 2017-04-19 20:46:02 -05:00
LetterJay
1f88a8d866 Merge pull request #475 from Citadel-Station-13/upstream-merge-26334 
[MIRROR] Fixes ghosts not hearing whispers with the toggle on
 2017-04-19 18:33:56 -05:00
LetterJay
95ec46d54b Merge pull request #489 from Citadel-Station-13/upstream-merge-26319 
[MIRROR] Moves simple animal automation from SSmob to SSnpc
 2017-04-19 18:33:18 -05:00
LetterJay
b926fd3c8f Merge pull request #486 from Citadel-Station-13/upstream-merge-26366 
[MIRROR] Fixes support holoparasites
 2017-04-19 18:32:46 -05:00
LetterJay
5e0fd179bb Merge pull request #477 from Citadel-Station-13/upstream-merge-26285 
[MIRROR] Cult stuff now initializes
 2017-04-19 18:29:35 -05:00
CitadelStationBot
dbd0af6b5c Moves simple animal automation from SSmob to SSnpc 2017-04-19 16:48:45 -05:00
CitadelStationBot
a7cd9335da Fixes support holoparasites 2017-04-19 16:45:31 -05:00
CitadelStationBot
73d4469db5 Cult stuff now initializes 2017-04-19 04:40:07 -05:00
CitadelStationBot
81ad880f54 Fixes ghosts not hearing whispers with the toggle on 2017-04-19 04:33:54 -05:00
CitadelStationBot
23d140abb9 Makes the monkey-to-human effect spawn in the correct position 2017-04-19 04:33:50 -05:00
Poojawa
ce577dc22c Citadel sprite file cleanups (#429) 
* Special folder cleanup

moved mam_body_markings and mam_taur to regular mob list for easier
locating. moved tail.dmi and wing.dmi to special

* oh

* this too.

* ports #423

alphabetatizes sprites because it was messy

* tweak special folder name to be clearer

* Travis appeasement
 2017-04-18 23:05:17 -05:00