shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,067 Commits 5 Branches 0 Tags
773a94dea69b51777991afeb5d7cfd79cf6daa41
Commit Graph

12455 Commits

Author SHA1 Message Date
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
pigeons
07bbc4d3af Actually links mineral sprites with their new location (#37564) 
Fixes sprites being broken
 2018-04-29 19:06:14 -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
b7cdd6a7fd Update networks.dm 2018-04-29 18:48:26 -04: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
deathride58
adf349db02 Update spiders.dm 2018-04-29 18:44:31 -04:00
deathride58
9d33974316 Update absorb.dm 2018-04-29 18:44:14 -04:00
deathride58
c075dbfe81 Update changeling_power.dm 2018-04-29 18:43:52 -04:00
deathride58
f46a77ba5c Update charged.dm 2018-04-29 18:43:11 -04:00
deathride58
3921590a4b Update life.dm 2018-04-29 18:42:17 -04:00
deathride58
e03e419b9e Update life.dm 2018-04-29 18:41:01 -04:00
deathride58
2890cfb978 Update mutations.dm 2018-04-29 18:37:51 -04:00
deathride58
b3b84b3dda Update flags.dm 2018-04-29 18:36:49 -04:00
deathride58
e66e348d5c Merge pull request #6572 from Citadel-Station-13/upstream-merge-37535 
[MIRROR] Fixes gas fusion power not being taken into account
 2018-04-29 22:33:37 +00:00
deathride58
41e4851500 Merge pull request #6569 from Citadel-Station-13/upstream-merge-37559 
[MIRROR] Fix grammar when cleaning things with the damp rag
 2018-04-29 22:33:07 +00:00
vuonojenmustaturska
ec2de88a65 Replaces HEALS_EARS_2 with a component, adds a wearertargeting parent component for future use 2018-04-29 17:32:12 -05:00
vuonojenmustaturska
f373b2c9e6 Kills off three more flags from flags_2 2018-04-29 17:30:55 -05:00
deathride58
483bcc66d5 Merge pull request #6563 from Citadel-Station-13/upstream-merge-37485 
[MIRROR] Condenses a check
 2018-04-29 22:30:41 +00:00
deathride58
6ae31ccf69 Merge pull request #6564 from Citadel-Station-13/upstream-merge-37514 
[MIRROR] Fixes invisible turtleneck alt state
 2018-04-29 22:30:12 +00:00
deathride58
7c27c97256 Merge pull request #6567 from Citadel-Station-13/upstream-merge-37511 
[MIRROR] fixes a pacifism kill through crushing firelocks!
 2018-04-29 22:29:44 +00:00
deathride58
a966874bed Merge pull request #6568 from Citadel-Station-13/upstream-merge-37506 
[MIRROR] Makes pacifists able to use .50BMG Soporific Rounds
 2018-04-29 22:29:12 +00:00
oranges
187f27983c Merge pull request #37535 from cyclowns/fusion-fix 
Fixes gas fusion power not being taken into account
 2018-04-29 17:18:30 -05:00
kevinz000
fe8e1cd61c [syou can no longer insert a storage object into itself, and therefore, no longer bohbomb with one boh (#37410) 
* paradox

* fine, byond.

* src.
 2018-04-29 15:21:02 -05:00
Tad Hardesty
ed7b8e7128 Fix grammar when cleaning things with the damp rag 2018-04-29 14:27:51 -05:00
iksyp
ba4f3c0698 Makes pacifists able to use .50BMG Soporific Rounds (#37506) 
* non lethal .50BMG

* no more spaghetti sauce?

I havent actually tested this
 2018-04-29 10:11:42 -05: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
ShizCalev
1478e17fea Fixes invisible turtleneck alt state 2018-04-29 10:04:52 -05:00
Jordan Brown
62d6329f56 Condenses a check 2018-04-29 10:03:39 -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
LetterJay
ab8355968c Update rped.dm 2018-04-29 02:28:43 -05:00
LetterJay
f606430d2b Merge pull request #6545 from Citadel-Station-13/upstream-merge-37478 
[MIRROR] [s] Fixes turret exploits
 2018-04-29 02:28:14 -05:00
LetterJay
c11c2ba70f Merge pull request #6544 from Citadel-Station-13/upstream-merge-37479 
[MIRROR] Fixes being unable to place a Robotic Factory if it failed to place after the prompt
 2018-04-29 02:25:37 -05:00
LetterJay
53ee2ab0a9 Merge pull request #6543 from Citadel-Station-13/upstream-merge-37465 
[MIRROR] Adds logging for PDA explosions
 2018-04-29 02:25:10 -05:00
LetterJay
89ffa04958 Merge pull request #6542 from Citadel-Station-13/upstream-merge-37442 
[MIRROR] Fixes jumpToNullSpace
 2018-04-29 02:24:52 -05:00
LetterJay
eddeff9c34 Merge pull request #6541 from Citadel-Station-13/upstream-merge-37385 
[MIRROR] Makes clogged vents scale, and way less powerful.
 2018-04-29 02:24:30 -05:00
LetterJay
44f966d0eb Merge pull request #6540 from Citadel-Station-13/upstream-merge-37461 
[MIRROR] Removes the signals on process procs
 2018-04-29 02:24:04 -05:00
LetterJay
e8fdaa1a43 Merge pull request #6539 from Citadel-Station-13/upstream-merge-37453 
[MIRROR] set waitfor in final countdown
 2018-04-29 02:21:56 -05:00
LetterJay
480882de58 Merge pull request #6538 from Citadel-Station-13/upstream-merge-37449 
[MIRROR] Removes some unused code.
 2018-04-29 02:21:31 -05:00
LetterJay
261e7fa1c1 Merge pull request #6537 from Citadel-Station-13/upstream-merge-37482 
[MIRROR] Fixes slime pressurization potion attempting to apply multiple times
 2018-04-29 02:21:07 -05:00
LetterJay
0bca7362e3 Merge pull request #6511 from Citadel-Station-13/upstream-merge-37389 
[MIRROR] Removes redundant COMPONENT_INCOMPATIBLE crashes
 2018-04-29 02:20:25 -05:00
LetterJay
57270f84d9 Merge pull request #6493 from Citadel-Station-13/upstream-merge-37299 
[MIRROR] Fixes ghosts being unable to see into nonadjacent bags
 2018-04-29 02:19:14 -05:00
Jordan Brown
db142667b7 Merge pull request #37501 from ShizCalev/icon-fixes 
Fixes missing icons
 2018-04-28 14:54:45 -05:00
LetterJay
803d3b59fd Merge pull request #6556 from Citadel-Station-13/upstream-merge-37497 
[MIRROR] Replaces a / with * as per Contributing.md [bscrystal.dm]
 2018-04-28 14:07:24 -05:00
LetterJay
b565ef9171 Merge pull request #6557 from Citadel-Station-13/upstream-merge-37384 
[MIRROR] Re-adds and reworks fusion.
 2018-04-28 14:07:08 -05:00
vuonojenmustaturska
3f6167d08e Moves several clothing-specific flags from /atom to their proper type 2018-04-28 13:21:48 -05:00
LetterJay
811cc06188 Merge pull request #6536 from Citadel-Station-13/upstream-merge-37436 
[MIRROR] Adds a stationloving component to replace a couple of flags and SSinbounds with
 2018-04-28 01:36:04 -05:00
LetterJay
ec1a16fed0 Merge pull request #6535 from Citadel-Station-13/upstream-merge-37480 
[MIRROR] Fixes pineapple pizza not actually tasting like pineapple
 2018-04-28 01:35:41 -05:00
LetterJay
d10dcf7cd7 Merge pull request #6534 from Citadel-Station-13/upstream-merge-37445 
[MIRROR] you can now print tools using the integrated circuit printer again
 2018-04-28 01:34:59 -05:00