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

3867 Commits

Author SHA1 Message Date
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
LetterJay
28947e1c89 Merge pull request #6729 from Citadel-Station-13/upstream-merge-37792 
[MIRROR] Fixes defibs/backpack watertanks/gatling lasers
 2018-05-13 10:14:07 -05:00
LetterJay
cf28aee1ee Merge pull request #6728 from Citadel-Station-13/upstream-merge-37464 
[MIRROR] Adds plasma rein glass to the ORM & adjusts material values on the various glass sheets.
 2018-05-13 10:12:28 -05:00
YPOQ
23f6567872 Fixes defibs/watertanks/gatling lasers (#37792) 2018-05-13 06:13:45 -05:00
FrozenGuy5
e9ef82513c Add plasma rein glass to the ORM & adjusts material values on the various glass sheets (#37464) 
* Update smelting_designs.dm

* Tweaks material values on titanium glass.

* Optimizes math & fixes errors and inconsistencies
 2018-05-13 06:13:36 -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
156b0529e1 Merge pull request #6722 from Citadel-Station-13/upstream-merge-37797 
[MIRROR] Adds desc to chemmaster circ board
 2018-05-13 03:30:26 -05:00
LetterJay
65fd97000c Merge pull request #6719 from Citadel-Station-13/upstream-merge-37707 
[MIRROR] Fixes large crates (Issue #36516)
 2018-05-13 03:29:21 -05:00
LetterJay
ee9e96106e Merge pull request #6717 from Citadel-Station-13/upstream-merge-37742 
[MIRROR] spellig fix
 2018-05-13 03:28:39 -05:00
LetterJay
80aad142a4 Merge branch 'master' into upstream-merge-37406 2018-05-13 03:28:37 -05:00
LetterJay
cbfa3053ee Merge pull request #6692 from Citadel-Station-13/upstream-merge-37558 
[MIRROR] Anomaly Armour Research
 2018-05-12 21:36:51 -05:00
81Denton
11d63f6a56 Adds desc to chemmaster circ board (#37797) 
* adds desc to chemmaster circ board

* ASS♂WE♂CAN♂

* don't drink and web edit kids
 2018-05-12 17:49:29 -05:00
LetterJay
f21cac1af2 Merge pull request #6700 from Citadel-Station-13/upstream-merge-37399 
[MIRROR] Use spritesheets to reduce time spent sending PNG assets by 90+%
 2018-05-12 17:04:23 -05:00
Alexch2
b0b9240466 Fixes large crates acting like lockers (#37707) 
* Fixes large crates acting like lockers

* removes forgotten comment

* Adds Cobby's suggestions, and makes the description more useful. Also improves feedback when using the wrong tool.
 2018-05-12 16:41:54 -05:00
Armhulen
56eab7e394 Fix spelling in mime forcefield description (#37742) 
* SPELL IT RIGHT REEEEEEEEEEEEEEEEE

* Awhile
 2018-05-11 17:30:58 -05:00
deathride58
a980e323b9 Merge pull request #6680 from Citadel-Station-13/upstream-merge-37727 
[MIRROR] [s] Removes some stationloving-related failure surface
 2018-05-11 03:44:29 +00:00
deathride58
993d72ec46 Merge pull request #6681 from Citadel-Station-13/upstream-merge-37438 
[MIRROR] [READY] Properly Adds a suicide action to the hand tele
 2018-05-11 03:44:06 +00:00
deathride58
8954754e7a Merge pull request #6684 from Citadel-Station-13/upstream-merge-37683 
[MIRROR] Replaces the Roman Shield and Roman Helmets in the autodrobe with fake versions with no block chance nor armour values.
 2018-05-11 03:41:53 +00: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
deathride58
19d09b4b2d Merge pull request #6697 from Citadel-Station-13/upstream-merge-37718 
[MIRROR] Distinguish between DNA and ID when failing to enter a mech
 2018-05-11 03:39:50 +00:00
deathride58
852d2a529e Merge pull request #6698 from Citadel-Station-13/upstream-merge-37548 
[MIRROR] fixes some inconsistency in the bulldog shotgun ammo
 2018-05-11 03:39:31 +00:00
deathride58
93aa92820d Merge pull request #6701 from Citadel-Station-13/upstream-merge-37770 
[MIRROR] Fixes anomalies not listening on the correct frequency
 2018-05-11 03:38:38 +00:00
deathride58
e0bceb405f Merge pull request #6702 from Citadel-Station-13/upstream-merge-37735 
[MIRROR] improves pda message immersion
 2018-05-11 03:36:22 +00:00
AnturK
096a8a63c5 Stops qdeleted objects from taking damage. (#37726) 
* Stops qdeleted objects from taking damage.

* Some logging.
 2018-05-10 02:30:01 -05:00
Iamgoofball
278ecd5d06 improves pda message immersion (#37735) 2018-05-10 01:08:37 -05:00
LetterJay
4533b983f6 Merge pull request #6689 from Citadel-Station-13/upstream-merge-37693 
[MIRROR] Fixes singuloth not disappearing after a set amount of time.
 2018-05-10 00:49:06 -05:00
YPOQ
f459f909c0 Fixes anomalies not listening on the correct frequency 2018-05-09 22:45:09 -05:00
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
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
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
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
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
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