shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,699 Commits 5 Branches 0 Tags
bfcaceb4e182f82fec5a4b1df65a52ccbfd5ced5
Commit Graph

966 Commits

Author SHA1 Message Date
deathride58 146f953966 Merge pull request #6694 from Citadel-Station-13/upstream-merge-37423 
[MIRROR] [s] Hallucinations 4.0
 2018-05-17 18:12:57 +00:00
ShizCalev 0e819cb1fc Fixes container_resist runtimes (#37888) 2018-05-17 10:57:48 -05:00
LetterJay 8efc7711a7 Merge branch 'master' into upstream-merge-37423 2018-05-16 12:17:57 -05:00
LetterJay f86af0ab41 Merge pull request #6743 from Citadel-Station-13/upstream-merge-37818 
[MIRROR] Fix some missing icons
 2018-05-15 06:52:32 -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
Jordan Brown 7dc1c116d5 Merge pull request #37818 from AutomaticFrenzy/patch/missing-icons 
Fix some missing icons
 2018-05-14 15:13:33 -05:00
LetterJay f9f42658e1 Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760 
[MIRROR] Fixed stacks sometimes having the wrong amount if created on another stack
 2018-05-14 12:28:41 -05:00
LetterJay ca86c93e70 Merge pull request #6676 from Citadel-Station-13/upstream-merge-37406 
[MIRROR] Adds (fake) ambient occlusion as a client preference
 2018-05-13 11:52:23 -05:00
XDTM 5847268db3 Linked teleporters now teleport to the hub instead of the power station (#37684) 2018-05-13 06:13:27 -05:00
LetterJay 80aad142a4 Merge branch 'master' into upstream-merge-37406 2018-05-13 03:28:37 -05:00
Tad Hardesty 021f30f0c0 Fixed stacks sometimes having the wrong amount if created on another stack 2018-05-11 17:30:32 -05:00
deathride58 aabd098e2e Merge pull request #6695 from Citadel-Station-13/upstream-merge-37709 
[MIRROR] Adds emag_act feedback msg to battle arcade machine
 2018-05-11 03:40:41 +00:00
Denton c34cf3d67f Hit it! They call me Cuban Pete I'm the king of the Rumba beat When I play the maracas I go Chic-chic-ky-boom Chic-chic-ky-boom Yes sir, I'm Cuban Pete I'm the craze of my native street When I start to dance everything goes Chic-chic-ky-boom Chic-chic-ky-boom The senioritas they sing And they swing with "terampero" It's very nice! So full of spice! And when they dance in they bring A happy ring that "era keros" Are singing a song All the day long So if you like the beat Take a lesson from Cuban Pete And I'll teach you to Chic-chic-ky-boom Chic-chic-ky-boom Chic-chic-ky-boom He's a really modest guy Although he's the hottest guy In Havana, in Havana Si, senorita I know That you would like a Chic-ky-boom-chick It's very nice - so full of spice I'll place my hand on your hip And if you will just give me your hand Then we shall try Just you and I "Iy-yi-yi!" "Shake your booty, daddy, wow! See ya'!" 2018-05-09 16:19:33 -05:00
XDTM ec3516ea19 [s] Hallucinations 4.0 2018-05-09 16:15:58 -05:00
Dax Dupont b29f399157 Fixes singuloth not disappeared after a set amount of time. 2018-05-09 13:42:44 -05:00
deathride58 bc6fbeb9fe Adds (fake) ambient occlusion as a client preference 2018-05-07 22:08:08 -05:00
81Denton ba0dc700df Axes the robotic fabricator (not the exofab) (#37668) 
* removes robofab

* that too
 2018-05-06 16:37:22 -05:00
oranges e0412f6325 Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code 2018-05-06 16:37:13 -05:00
Fox McCloud f5031bc4f7 Fixes Several Machines Materials Insertion (#37432) 
* Fixes Several Machines Materials Insertion

* attackby disable and show on examine fix
 2018-05-04 04:40:56 -05:00
deathride58 f5cbfd1c52 Merge pull request #6577 from Citadel-Station-13/upstream-merge-36839 
[MIRROR] Deactivate suicide prescans via ghost var
 2018-05-02 14:25:32 +00:00
deathride58 084f2ac1da Merge pull request #6606 from Citadel-Station-13/upstream-merge-37593 
[MIRROR] Revert "fixes a pacifism kill through crushing firelocks! (#37511)"
 2018-05-02 01:29:15 +00:00
deathride58 dca50e5d35 Merge pull request #6575 from Citadel-Station-13/upstream-merge-37349 
[MIRROR] Adds fly and moth categories to limb grower
 2018-05-02 01:21:37 +00:00
deathride58 e26f1cd78b Merge pull request #6553 from Citadel-Station-13/upstream-merge-37165 
[MIRROR] NTNet improvements!
 2018-05-02 01:17:10 +00:00
Jordan Brown a3ca01f158 Merge pull request #37593 from optimumtact/revertarmshit 
Revert "fixes a pacifism kill through crushing firelocks! (#37511)"
 2018-04-30 21:20:43 -05:00
kevinz000 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
george99g 0a02d1cb13 Deactivate suicide prescans via ghost var 2018-04-29 21:33:56 -05:00
erwgd 2ca75d7de7 added fly and moth categories to limb grower and limbgrower_designs.dm (#37349) 
only human and lizard synthetic limbs will have should_draw_greyscale set to true

added /improper and uncapitalised synthetic limb names

removed plasmaman parts from human_parts_greyscale.dmi
 2018-04-29 17:52:44 -05:00
deathride58 6f13d2c2e9 Merge pull request #6546 from Citadel-Station-13/upstream-merge-37380 
[MIRROR] Refactors and fixes RPEDs
 2018-04-29 22:45:28 +00:00
Armhulen 814dc3f811 fixes a pacifism kill through crushing firelocks! (#37511) 
* fix!

* ORANGES LOOK AWAY

* thanks maintainer
 2018-04-29 10:09:29 -05:00
LetterJay c287c3a84c Merge pull request #6548 from Citadel-Station-13/upstream-merge-37483 
[MIRROR] Fixes obj descs and adds missing ones
 2018-04-29 02:29:44 -05:00
LetterJay 71b362e41e Merge pull request #6547 from Citadel-Station-13/upstream-merge-37473 
[MIRROR] Lets quantum pads be used by sillycones properly.
 2018-04-29 02:29:05 -05:00
kevinz000 6ed120aad4 NTNet improvements! 2018-04-27 20:24:28 -05:00
81Denton b368ab377b fixes obj descs and adds new ones (#37483) 2018-04-27 13:21:08 -05:00
kevinz000 73d5c92c2b Quantum pad interaction (#37473) 2018-04-27 13:17:52 -05:00
Dax Dupont 4850230fc4 Refactors and fixes RPEDs 2018-04-27 13:13:37 -05:00
ShizCalev 185a6c4a90 Fixes turret exploits (#37478) 2018-04-27 13:12:24 -05:00
deathride58 ab3c55ab23 replaces randomized wires with departmental wires (#6376) 2018-04-27 07:42:09 -07:00
Poojawa cc6b320f83 game folder 2018-04-23 00:17:28 -05:00
LetterJay e97db8a33c Merge pull request #6481 from Citadel-Station-13/upstream-merge-37339 
[MIRROR] Fixes a lack of feedback when entering too many points for the gulag.
 2018-04-22 22:23:07 -05:00
Dax Dupont af48fe9dcf Fixes a lack of feedback when entering too many points for the gulag. (#37339) 2018-04-22 19:42:47 -05:00
Jordan Brown 70a0db6173 Merge pull request #37310 from Jalleo/apc_control_changes 
Fixes and optimises apc_control.dm a tad.
 2018-04-22 09:31:10 -05:00
LetterJay 3966683e17 Merge pull request #6460 from Citadel-Station-13/upstream-merge-37280 
[MIRROR] Removes random spawn
 2018-04-22 02:46:38 -05:00
AnturK b0e97784da Removes random spawn (#37280) 2018-04-19 05:46:39 -05:00
81Denton 7caad40e3f Fixes lavaland syndie base rads + SSU compartment issues (#37252) 
* radsuit SSU, syndie lava base rad protection

* re-adds missing combat gloves

* defines radsuit SSU name by the obj
 2018-04-18 07:02:10 -05:00
LetterJay 86ca6b424d Merge pull request #6366 from Citadel-Station-13/upstream-merge-37122 
[MIRROR] Fixes interaction AI stuff
 2018-04-14 07:44:50 -05:00
ShizCalev 5dfd1f7d42 grunge airlock 2018-04-13 09:04:55 -05:00
deathride58 ce946619b3 Merge pull request #6348 from Citadel-Station-13/upstream-merge-37088 
[MIRROR] Fix double-fullstop in the jukebox's description
 2018-04-11 21:35:21 +00:00
deathride58 6c107f538a Merge pull request #6361 from Citadel-Station-13/upstream-merge-37107 
[MIRROR] Fixes jukebox ghost message spam
 2018-04-11 21:29:28 +00:00
deathride58 1f44356e49 Merge pull request #6364 from Citadel-Station-13/upstream-merge-37120 
[MIRROR] [s] Adds a centcom level check to launchpad.
 2018-04-11 21:28:50 +00:00
vuonojenmustaturska d559fc1bd3 remove 512 version checks 2018-04-11 14:26:41 -05:00