cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,973 Commits 55 Branches 0 Tags
06d08c67c317dd4cfd7e7599542b09a0fabfa46f
Commit Graph

1226 Commits

Author SHA1 Message Date
CitadelStationBot
06d08c67c3 [MIRROR] Makes tear in the fabric of reality inaccessible until a boh bomb is detonated (#7327) 
* Makes tear in the fabric of reality inaccessible until a boh bomb is detonated (#38852)

* a commit message

* reviews addressed?

* Makes tear in the fabric of reality inaccessible until a boh bomb is detonated
 2018-07-04 18:38:53 -07:00
LetterJay
2303e23f2c Merge pull request #7278 from Citadel-Station-13/upstream-merge-38776 
[MIRROR] Potentially fixes monkey fever runtiming on infection
 2018-07-01 09:37:24 -05:00
XDTM
1a56d8243e Potentially fixes monkey fever runtiming on infection (#38776) 2018-07-01 05:42:07 -05:00
kevinz000
8b1917f149 Update bag_of_holding.dm 2018-06-27 01:38:36 -07:00
CitadelStationBot
e244438443 [MIRROR] Prevents tourettes from stacking (#7253) 
* fixes tourettes being cancer (#38682)

Prevents tourettes from stacking

* Prevents tourettes from stacking
 2018-06-25 18:21:17 -07:00
LetterJay
d79b85d719 trims a few issues during mirror merges 2018-06-24 18:42:24 -05:00
LetterJay
acd10b02cf Merge pull request #7195 from Citadel-Station-13/upstream-merge-38574 
[MIRROR] Global component signals
 2018-06-24 18:20:17 -05:00
CitadelStationBot
386bc528ea [MIRROR] Add logging to teleport and the teleporter destination setting (#7225) 
* Add logging to teleport and the teleporter destination setting (#38645)

Helps with some admin issues

* Add logging to teleport and the teleporter destination setting
 2018-06-22 00:34:41 -07:00
Jordan Brown
c11557d23d Global component signals 2018-06-19 17:18:34 -05:00
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
c58dbc1110 Merge pull request #7138 from Citadel-Station-13/upstream-merge-38476 
[MIRROR] [s] Fix launchpads creating way too many sparks
 2018-06-18 10:09:42 -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
LetterJay
c00f4f04d1 Merge pull request #7116 from Citadel-Station-13/upstream-merge-38489 
[MIRROR] Some minor pubby shuttle tweaks
 2018-06-16 16:16:36 -05:00
Jordan Brown
e95851c8f6 Merge pull request #38476 from AutomaticFrenzy/patch/sparks 
[s] Fix launchpads creating way too many sparks
 2018-06-16 15:53:42 -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
Dax Dupont
e5b95cfcdd Some minor pubby shuttle tweaks (#38489) 
* Some minor pubby shuttle tweaks

* no step

* Good idea denton

* thanks guys
 2018-06-16 06:17:57 -05:00
Jordan Brown
8f2283c20e Adds some signal helpers (#38494) 2018-06-16 06:17:26 -05:00
CitadelStationBot
f9d5987993 [MIRROR] [s]Diseases lose scan invisibility if their stealth drops below the threshold (#7082) 
* Merge pull request #38415 from XDTM/master_of_disguise

[s]Diseases lose scan invisibility if their stealth drops below the threshold

* [s]Diseases lose scan invisibility if their stealth drops below the threshold
 2018-06-15 02:47:11 -07:00
CitadelStationBot
727b1a1b14 [MIRROR] Fixes clothes getting damaged twice in explosions. (#7097) 
* Fixes clothes getting damaged twice in explosions. (#38435)

* Fixes clothes getting damaged twice in explosions.
 2018-06-15 02:44:01 -07: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
CitadelStationBot
8413eb2888 [MIRROR] Squashes traitors under one path (#7049) 
* Squashes traitors under one path (#38332)

* Squashes traitors under one path
 2018-06-10 12:30:00 -07: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
AnturK
717e635d28 Fixes some holocall stuff (#38209) 
* Fixes some holocall stuff

* Yep
 2018-06-06 14:25:23 -05:00
81Denton
9fd7bfb347 Blacklist ion trails from chasms (#38284) 2018-06-05 13:29:53 -05:00
CitadelStationBot
0b362e017b [MIRROR] Lavaland Clock Cult Ruin (#7011) 
* Lavaland Clock Cult Ruin (#38263)

* Dead Ratvar

* tgm map

* Lavaland Clock Cult Ruin
 2018-06-05 11:16:55 -07:00
LetterJay
896eb8cacb Merge pull request #7004 from Citadel-Station-13/upstream-merge-38257 
[MIRROR] Fixes some advanced disease thresholds
 2018-06-03 16:23:58 -05:00
LetterJay
9c4d7ca029 Merge pull request #7001 from Citadel-Station-13/upstream-merge-38228 
[MIRROR] we can stop using getFlatIcon?
 2018-06-03 16:22:09 -05:00
Yenwodyah
6791d13e81 Fix some advanced disease thresholds (#38257) 2018-06-03 15:47:20 -05:00
vuonojenmustaturska
f83dc08fa7 are we free? (#38228) 2018-06-03 13:21:03 -05:00
ShizCalev
67841c3f19 Fixes pocket items being deleted when monkeyizing (#38220) 2018-06-03 09:04:08 -05:00
LetterJay
6c5283be9f Merge pull request #6974 from Citadel-Station-13/upstream-merge-38198 
[MIRROR] Blacklist projectile effects from chasms
 2018-06-02 07:29:38 -05:00
LetterJay
5646dd794b Merge pull request #6973 from Citadel-Station-13/upstream-merge-38180 
[MIRROR] Fix family heirloom being lost on cloning
 2018-06-02 07:29:17 -05:00
LetterJay
d05e01e5a5 Merge pull request #6956 from Citadel-Station-13/upstream-merge-38201 
[MIRROR] [s] Remove datum/action/generic
 2018-06-02 07:20:04 -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
Jordan Brown
f2124aa3cf Merge pull request #38180 from AutomaticFrenzy/patch/heirloom-clone 
Fix family heirloom being lost on cloning
 2018-06-01 09:51:08 -05:00
Cruix
9c4f4ce17f AI Multicamera mode (#37695) 
* Added multicamera mode for AIs

* Minor multicamera fixes

* Cameras near an AI multicamera eye now light up red

* Disabled AI multicamera mode without admin intervention

* Fixed AIs being able to use multicamera mode when they should not
 2018-05-31 22:41:48 -05:00
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
Tad Hardesty
ecd16515c5 Remove datum/action/generic (#38201) 2018-05-31 22:40:17 -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
d62cb31e9b [MIRROR] Shuffles Exited() call to after loc is actually changed in forceMove. Fixes storage forcing everything to mouse opacity fulltile (#6884) 
* Delete some duplicate macro definitions

* sql changelog changes ping the host

* Templates the caravan ambush ruin shuttles

* Update CODEOWNERS

* Update components.dm

* Shuffles Exited() call to after loc is actually changed in forceMove. Fixes storage forcing everything to mouse opacity fulltile

* Initial Placeholder

* Update caravanambush.dmm
 2018-05-27 19:27:56 -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