shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,774 Commits 5 Branches 0 Tags
8f7ca9fbbaba897ef9bb504e53c8fbbcfea629e7
Commit Graph

240 Commits

Author SHA1 Message Date
CitadelStationBot
03a22ca16d [MIRROR] Transit space refactor (#7130) 
* Transit space refactor

* Update bitfields.dm
 2018-06-18 11:51:02 -07:00
LetterJay
119fb6abf6 Merge pull request #7159 from Citadel-Station-13/upstream-merge-38542 
[MIRROR] Some minor cleanup to RegisterSignal
 2018-06-18 12:28:11 -05:00
LetterJay
29ae18fb1a Merge pull request #7157 from Citadel-Station-13/upstream-merge-38461 
[MIRROR] Fixes the Blob being banished to the shadow realm
 2018-06-18 12:23:03 -05:00
LetterJay
c40a2e698d Merge pull request #7137 from Citadel-Station-13/upstream-merge-38496 
[MIRROR] Fix being able to pull mirage borders, others
 2018-06-18 10:09:20 -05:00
Jordan Brown
548d498a5e Merge pull request #38542 from ninjanomnom/do-you-have-a-callback-license 
Some minor cleanup to RegisterSignal
 2018-06-18 09:37:57 -05:00
CitrusGender
ba6c5324f0 Fixes the Blob being banished to the shadow realm (#38461) 
* blob now respawns like nuke disk if off z-level

* can't do it, sorry nak

* space

* muh codebaby

* Revert "CitrusGender my friend, don't you start away uneasy"
 2018-06-18 09:37:35 -05:00
Jordan Brown
9acc97dabe Merge pull request #38496 from AutomaticFrenzy/patch/mirage-borders 
Fix being able to pull mirage borders, others
 2018-06-16 15:50:27 -05:00
Jordan Brown
8f2283c20e Adds some signal helpers (#38494) 2018-06-16 06:17:26 -05:00
CitadelStationBot
0ab6db65a7 [MIRROR] BoH bombs now forcefully stun anyone flying when they go off (#7100) 
* BoH bombs now forcefully stun anyone flying when they go off (#38397)

* Update bag_of_holding.dm

* Incorrect type.

* BoH bombs now forcefully stun anyone flying when they go off
 2018-06-13 19:44:43 -07:00
LetterJay
8b65c88f64 Merge pull request #7077 from Citadel-Station-13/upstream-merge-38404 
[MIRROR] Fixes unintentional vehicle buff
 2018-06-12 08:08:51 -05:00
kevinz000
4d9645766a Fixes unintentional vehicle buff (#38404) 2018-06-12 00:57:53 -05:00
oranges
4f379bb0d0 Merge pull request #38376 from AutomaticFrenzy/patch/lockbox 
[s] Fix lockboxes not actually being locked
 2018-06-11 22:30:08 -05:00
XDTM
c67fe4a76f Anti-magic component start enabled (#38388) 2018-06-11 00:16:00 -05:00
deathride58
e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128 
[MIRROR] Standardizes and cleans up some admin messages & logging
 2018-06-09 05:53:25 +00:00
Jordan Brown
7c5217746f Merge pull request #38309 from kevinz000/patch-517 
Vehiclecode is now far more responsive when their movespeed delays are changed after they move.
 2018-06-07 08:40:39 -05:00
81Denton
9fd7bfb347 Blacklist ion trails from chasms (#38284) 2018-06-05 13:29:53 -05:00
Jordan Brown
948a128a72 Merge pull request #38198 from AutomaticFrenzy/patch/chasm-beams 
Blacklist projectile effects from chasms
 2018-06-01 09:52:21 -05:00
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951) 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
 2018-05-31 16:03:18 -07:00
CitadelStationBot
5909c7c639 [MIRROR] Changes default button for BoH confirmation prompt (#6811) 
* Changes default button for BoH confirmation prompt

* Update bag_of_holding.dm
 2018-05-27 17:25:58 -07:00
Jordan Brown
e582e7019e Merge pull request #38023 from AutomaticFrenzy/patch/toh-kay 
Fix various bugs with telekinesis
 2018-05-25 10:49:21 -05:00
LetterJay
e4eb4939b4 Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582 
[MIRROR] Makes more messages pronoun sensitive
 2018-05-23 07:46:26 -05:00
LetterJay
e37c1886c3 Merge pull request #6852 from Citadel-Station-13/upstream-merge-37970 
[MIRROR] Chasms no longer drop those buckled to undroppable objects
 2018-05-23 06:45:09 -05:00
LetterJay
e7d9cd0698 Merge branch 'master' into upstream-merge-37597 2018-05-23 05:21:19 -05:00
LetterJay
3666ec9878 Merge pull request #6574 from Citadel-Station-13/upstream-merge-37530 
[MIRROR] Replaces HEALS_EARS_2 with a component, adds a wearertargeting parent component for future use
 2018-05-23 05:18:15 -05:00
kevinz000
f245529511 Chasms no longer drop those buckled to undroppable objects (#37970) 
* Chasms no longer drop those buckled to undroppable objects

* Moves a check down for efficiency/not needing to check things twice

* Change logic order so this hack works
 2018-05-22 22:12:06 -05:00
LetterJay
06b7cdf27a Merge branch 'master' into upstream-merge-37529 2018-05-22 08:02:46 -05:00
LetterJay
6a575f19d1 Merge branch 'master' into upstream-merge-37597 2018-05-22 07:21:53 -05:00
LetterJay
c1aab03bb5 Merge branch 'master' into upstream-merge-37530 2018-05-22 07:19:06 -05:00
LetterJay
e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -05:00
Tad Hardesty
9b4b9b4f34 Refresh mob views when atoms enter/exit storage (#37954) 2018-05-21 04:46:20 -05:00
Barhandar
bcd2b0a3b0 Replaces adding goliath plates to clothing and APLUs with a customizable tracking component (#37525) 
add: Amount of goliath plates is now shown in examine for explorer suits and mining hardsuits.


I was peeved by being unable to tell whether the armour is upgraded or not except by trying to stick more plates on it.

I think a more correct way would be to add a plate amount var to these items similarly to APLU plating and then have description mention their amount and, for added transparency, that it's possible to improve it if there's 0 plates.

Please point the errors/wrongs in it, since "current armour value minus constant divided by value each plate adds" is rather clunky code.
 2018-05-13 18:55:56 -05:00
Emmett Gaines
b036b1e519 Makes the redirect component able to transfer with changeturfs (#37697) 2018-05-12 16:29:28 -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
kevinz000
3819a5a9b5 Fixes EMPs (#37656) 2018-05-10 01:33:25 -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
725634c9ea Update material_container.dm 2018-05-06 03:09:47 -04:00
LetterJay
4dd07fe4e7 Merge pull request #6641 from Citadel-Station-13/upstream-merge-37447 
[MIRROR] Fixes mousetraps not going off from being dumped out
 2018-05-05 09:38:11 -05:00
kevinz000
4a7fae664e Fixes mousetraps not going off from being dumped out (#37447) 
* mousetrap fix

* fix mousetraps

* Update storage.dm

* Combine checks
 2018-05-04 04:43:12 -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
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
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
f248685db2 Merge pull request #6607 from Citadel-Station-13/upstream-merge-37579 
[MIRROR] Fix placing boxes in storage implants
 2018-05-02 01:29:41 +00:00
deathride58
613fadf057 Update _concrete.dm 2018-05-01 21:27:01 -04: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
deathride58
e8f4602716 Update implant.dm 2018-05-01 21:16:05 -04:00
Tad Hardesty
34321883cc Fix placing boxes in storage implants 2018-05-01 07:30:07 -05:00
Jordan Brown
1675490652 Modifies component transfer to make ChangeTurf able to transfer components 2018-04-30 21:16:48 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00