shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,183 Commits 5 Branches 0 Tags
2a33dcd3338900cf72e07b8b7b6ef800982f401f
Commit Graph

12533 Commits

Author SHA1 Message Date
Jordan Brown 9c9b2feefc Merge pull request #37510 from JJRcop/throw_myself 
Circuits can't throw themselves
 2018-04-30 13:04:19 -05:00
Jordan Brown 12eb6a8a97 Merge pull request #37513 from ShizCalev/pineapple-memes 
Adds traits for a character's preference towards pineapples.
 2018-04-30 13:02:05 -05:00
Jordan Brown a9d452a24d Merge pull request #37549 from ShizCalev/bounce_away-fixes 
Resolved var name conflict for bounce_away()
 2018-04-30 12:51:40 -05:00
Jordan Brown bf0fe93f35 Merge pull request #37556 from 81Denton/techweb-sunglasses 
More holosigns for techwebs
 2018-04-30 12:48:12 -05:00
Jordan Brown 8f1bb462ad Merge pull request #37554 from DaxDupont/vents 
Adds some more reagents to clogged vents
 2018-04-30 12:46:58 -05:00
LetterJay 7205a15ef7 Merge pull request #6591 from Citadel-Station-13/upstream-merge-37577 
[MIRROR] Removes a duplicate comsig I accidently added
 2018-04-30 11:06:19 -05:00
LetterJay 94bebc33a0 Merge pull request #6590 from Citadel-Station-13/upstream-merge-37494 
[MIRROR] [s] Small tweaks and fixes a edgecase with machine construction
 2018-04-30 11:03:33 -05:00
LetterJay 34ce5380d6 Merge pull request #6589 from Citadel-Station-13/upstream-merge-37500 
[MIRROR] Removed /obj/item/asteroid path
 2018-04-30 11:03:16 -05:00
LetterJay 372e363257 Merge pull request #6588 from Citadel-Station-13/upstream-merge-37437 
[MIRROR] Fixes circuits being able to detect ghosts and fix pinless guns
 2018-04-30 11:02:58 -05:00
LetterJay a082da66f3 Merge pull request #6587 from Citadel-Station-13/upstream-merge-37499 
[MIRROR] Fixes bikehorn mood event
 2018-04-30 11:02:36 -05:00
LetterJay fcb1261c13 Merge pull request #6586 from Citadel-Station-13/upstream-merge-37503 
[MIRROR] Fixes Blast Cannon
 2018-04-30 11:02:16 -05:00
LetterJay 6885655022 Merge pull request #6585 from Citadel-Station-13/upstream-merge-37544 
[MIRROR] Adds a 2.5 second fire delay to beam rifles
 2018-04-30 10:21:06 -05:00
LetterJay 794d078dff Merge pull request #6584 from Citadel-Station-13/upstream-merge-37489 
[MIRROR] [s] Fixes the fryer shrinking the size of objects
 2018-04-30 10:20:53 -05:00
LetterJay b493bfe89f Merge pull request #6582 from Citadel-Station-13/upstream-merge-37496 
[MIRROR] IC weapon mechanism only works when assembly is on turf
 2018-04-30 10:11:54 -05:00
LetterJay e2ef2ee0f3 Merge pull request #6583 from Citadel-Station-13/upstream-merge-37498 
[MIRROR] Fixes glass stack explosion act
 2018-04-30 09:43:13 -05:00
LetterJay 6672d8856e Merge pull request #6579 from Citadel-Station-13/upstream-merge-37422 
[MIRROR] Adds a cooldown to PDA send to all messages.
 2018-04-30 09:42:06 -05:00
vuonojenmustaturska 3fc7b4ca3b Merge pull request #37577 from kevinz000/patch-495 
Removes a duplicate comsig I accidently added
 2018-04-30 09:32:58 -05:00
Jalleo 987cce76ed [s] Small tweaks and fixes a edgecase with machine construction (#37494) 
* Puts back required time for the emitter and field_generator and also removes a certain issue that certain people were causing

* Couple of things I missed

* I noticed the error with regards to atom and changed to obj like I was trying to originally. Also its fine to build on tables that wasnt the issue with this specific aspect.

* Edge windows. We need those.

* optimised the checks to be behind a if check for when you are actually needing to make something for the floor...

* Corrects a input proc by request

* Working is not my strong suit.
 2018-04-30 05:00:24 -05:00
ShizCalev 3160d7771d Removed /obj/item/asteroid path (#37500) 
* Cleans up some item paths

* removed kebab
 2018-04-30 04:57:09 -05:00
kevinz000 7feea76eee Fixes circuits being able to detect ghosts and fix pinless guns (#37437) 
* Circuit exploit fixes

* Update input.dm
 2018-04-30 04:55:55 -05:00
vuonojenmustaturska 665bd35f78 Merge pull request #37499 from ShizCalev/bikehorn-fix 
Fixes bikehorn mood event
 2018-04-30 04:55:47 -05:00
Fox McCloud e2328a122e Fixes Blast Cannon (#37503) 
* Fixes Blast Cannon

* no magic numbers

* tweak
 2018-04-30 04:53:32 -05:00
kevinz000 3ba3d5fb5e beam rifle delay (#37544) 2018-04-30 04:53:21 -05:00
ShizCalev 948f34406a [s] Fixes the fryer shrinking the size of objects (#37489) 
* Fixes the fryer shrinking the size of objects

* few more vars
 2018-04-30 04:52:08 -05:00
ShizCalev 5adabb4b91 Fixes glass stack explosion act (#37498) 2018-04-30 04:50:55 -05:00
Evsey Antonovich 6df3ffcddf IC weapons only works on turfs (#37496) 2018-04-30 01:31:06 -05:00
Dax Dupont a705b2c31c Adds a cooldown to PDA send to all messages. (#37422) 
* Adds a cooldown to PDA send to all messages.

* aaa

aaa

* forgot this one

* condom
 2018-04-30 01:08:03 -05:00
Mickyan 01e4304326 Makes nutrition level show up on self-inspect (#37509) 
* Makes nutrition level shows up on self-inspect

* Changed to switch statement, edited flavor text
 2018-04-30 00:17:59 -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
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