shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,942 Commits 5 Branches 0 Tags
558a989d8a957504ea3fe0e1a5b3f21ba34e8597
Commit Graph

4458 Commits

Author SHA1 Message Date
Tad Hardesty 111ad79eab Use spritesheets to reduce time spent sending PNG assets by 90+% 2018-05-09 22:44:57 -05:00
Tlaltecuhtli 325b31f11e fixes some inconsistency in the bulldog shotgun ammo (#37548) 
the default bulldog shotgun ammo makes sense now
 2018-05-09 16:24:17 -05:00
Tad Hardesty a1db36f316 Distinguish between DNA and ID when failing to enter a mech 2018-05-09 16:22:03 -05: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
KorPhaeron cc8fb19166 Anomaly Armour Research 2018-05-09 15:55:03 -05:00
Dax Dupont b29f399157 Fixes singuloth not disappeared after a set amount of time. 2018-05-09 13:42:44 -05:00
kevinz000 566ca84c21 edge case 2018-05-09 13:41:28 -05:00
Tad Hardesty 9ef257db50 [s] Fix wallets acting as though they still contain removed IDs 2018-05-09 10:32:00 -05:00
Firecage 694726e89d Replaces the Roman Shield and Roman Helmets in the autodrobe with fake versions with no block chance nor armour values. (#37683) 
* removes the block chance from the Roman Shield.

* replaces the Roman Shield in the autodrobe with a toy version with no block chance.

* replaces the armoured roman helmets from the autodrobe with fake ones.
 2018-05-09 00:49:19 -05:00
Jordan Brown 1a25c685a1 Update DMAPI to version 3.2.1.0 2018-05-08 21:33:58 -05:00
TheDreamweaver b0496f63a6 [READY] Properly Adds a suicide action to the hand tele 2018-05-08 20:08:03 -05:00
vuonojenmustaturska 003eced6af [s] Removes some stationloving-related failure surface (#37727) 
COMSIG_TRY_STORAGE_TAKE fails, leaving the disk out-of-bounds. forceMove HAS to be good enough here.
 2018-05-08 16:40:56 -05:00
deathride58 bc6fbeb9fe Adds (fake) ambient occlusion as a client preference 2018-05-07 22:08:08 -05:00
deathride58 37d65a54ff Merge pull request #6666 from Citadel-Station-13/upstream-merge-37632 
[MIRROR] Shows assemblies some love. ♥
 2018-05-07 19:41:21 +00:00
kevinz000 9d39b2859a Geiger counters can now scan the radiation of anything! (#37688) 2018-05-07 13:51:26 -05:00
deathride58 c1755468b7 Update reverse_bear_trap.dm 2018-05-07 08:50:32 -04:00
deathride58 e3ad766f33 Merge pull request #6664 from Citadel-Station-13/upstream-merge-37668 
[MIRROR] Axes the robotic fabricator (not the exofab)
 2018-05-07 12:45:09 +00:00
deathride58 8bc97a10d6 Merge pull request #6667 from Citadel-Station-13/upstream-merge-37676 
[MIRROR] Prevents electric grills from mass producing lightning through exploits
 2018-05-07 12:44:12 +00:00
deathride58 757cd6aa73 Merge pull request #6668 from Citadel-Station-13/upstream-merge-37680 
[MIRROR] Improves skittish code
 2018-05-07 12:43:47 +00:00
vuonojenmustaturska 4b36831fbe Merge pull request #37681 from kevinz000/patch-499 
Fixes supply pod duping
 2018-05-06 16:38:08 -05:00
vuonojenmustaturska 8e791af911 Merge pull request #37680 from kevinz000/patch-498 
Improves skittish code
 2018-05-06 16:37:57 -05:00
vuonojenmustaturska ed41503127 Merge pull request #37676 from AverageJoe82/electric-grill-engine 
Prevents electric grills from mass producing lightning through exploits
 2018-05-06 16:37:49 -05:00
ShizCalev 6415ecdbe9 Shows assemblies some love. ♥ 2018-05-06 16:37:40 -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
deathride58 50f8779fc0 Merge branch 'master' into upstream-merge-37486 2018-05-06 07:15:48 +00:00
deathride58 d4d052bae2 Update radio.dm 2018-05-06 03:10:20 -04:00
deathride58 6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
81Denton d44b1b9b2e Adds desc to vendor circuit board (#37647) 
* FEED ME A STRAY CAT

* forgive me for I have web edited

* AAAAAHH
 2018-05-05 17:54:54 -05:00
LetterJay f387bb1694 Merge pull request #6633 from Citadel-Station-13/upstream-merge-37622 
[MIRROR] Changes cockroach guts to insect guts
 2018-05-05 09:40:11 -05:00
CitadelStationBot bdd613fa05 Merge pull request #6650 from Citadel-Station-13/upstream-merge-37659 
[MIRROR] Crayons no longer use charge when used on a canvas
 2018-05-05 09:35:01 -05:00
oranges d5be66cf9a Crayons no longer use charge when used on a canvas 2018-05-04 22:27:00 -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
ShizCalev b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
CitadelStationBot a351edea90 Merge pull request #6625 from Citadel-Station-13/upstream-merge-37414 
[MIRROR] Removes stock market
 2018-05-03 09:01:12 -05:00
Jordan Brown deddd8debe Merge pull request #37622 from ShizCalev/cockarock 
Changes cockroach guts to insect guts
 2018-05-03 08:42:46 -05:00
pigeons 2702788dac Removes stock market 2018-05-02 17:48:55 -05:00
Mickyan 5596472fc1 fixes midori cigs being empty (#37615) 2018-05-02 17:31:14 -05:00
vuonojenmustaturska 0958d35b26 replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2 2018-05-02 13:14:43 -05:00
deathride58 892cb0a1be Update reverse_bear_trap.dm 2018-05-02 10:35:31 -04:00
deathride58 3f50934c92 Update headset.dm 2018-05-02 10:34:45 -04:00
deathride58 c7ea689679 Update nuclear.dm 2018-05-02 10:33:50 -04:00
deathride58 5098e0db21 Merge pull request #6490 from Citadel-Station-13/upstream-merge-37381 
[MIRROR] Fixes toolbelts holding everything
 2018-05-02 14:27:25 +00: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 55566461c6 Merge pull request #6601 from Citadel-Station-13/upstream-merge-37565 
[MIRROR] Modifies component transfer to make ChangeTurf able to transfer components
 2018-05-02 13:59:14 +00:00
deathride58 f35bfa22e4 Merge pull request #6614 from Citadel-Station-13/upstream-merge-37475 
[MIRROR] H.O.G.A.N. lawset
 2018-05-02 01:33:19 +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 2b8e734488 Merge pull request #6603 from Citadel-Station-13/upstream-merge-37560 
[MIRROR] Fix mecha maintenance protocol button always saying Initiate
 2018-05-02 01:27:51 +00:00
deathride58 fa5db57b56 Merge pull request #6600 from Citadel-Station-13/upstream-merge-37568 
[MIRROR] Removes enriched uranium
 2018-05-02 01:26:27 +00:00