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 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,973 Commits 55 Branches 0 Tags
06d08c67c317dd4cfd7e7599542b09a0fabfa46f
Commit Graph

11210 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
CitadelStationBot
7673384890 [MIRROR] [s] Fixes announcement XSS (#7324) 
* [s] Fixes announcement XSS

* Merge pull request #38892 from ThatLing/robots-are-very-delicate

[s] Fixes announcement XSS
 2018-07-04 17:40:10 -07:00
Letter N
abc32ed0df adds "cap's female formal outfit" (#7307) 
* Update under.dm

* modifies cit_clothes.dmi

* Updates uniforms.dmi

* Update security.dm

* now wont remove other clothing stuff (TM)

* Add files via upload

* Update under.dm
 2018-07-04 05:37:01 -07:00
CitadelStationBot
22e56253d0 [MIRROR] Fixes gravity gun runtimes. (#7310) 
* Merge pull request #38867 from AnturK/gravgun

Fixes gravity gun runtimes.

* Fixes gravity gun runtimes.
 2018-07-03 09:14:26 -07:00
CitadelStationBot
7f0c82b0ba [MIRROR] SDQL where filter message is now correct (#7309) 
* Merge pull request #38853 from optimumtact/seequeuedeeall

SDQL where filter message is now correct

* SDQL where filter message is now correct
 2018-07-03 09:14:00 -07:00
CitadelStationBot
0500be9b35 [MIRROR] Fixes some shard harddel stuff. (#7299) 
* Fixes some shard harddel stuff. (#38799)

* Fixes some shard harddel stuff.
 2018-07-02 06:44:50 -07:00
CitadelStationBot
6b0e597553 [MIRROR] Fix circuit printer printing finished TEG machinery (#7294) 
* Merge pull request #38844 from AutomaticFrenzy/patch/circuits

Fix circuit printer printing finished TEG machinery

* Fix circuit printer printing finished TEG machinery
 2018-07-02 03:23:49 -07:00
LetterJay
74f7e56f4e Merge pull request #7284 from Citadel-Station-13/upstream-merge-38797 
[MIRROR] Fixes TGUI runtime
 2018-07-01 09:41:03 -05:00
LetterJay
ee0bef443e Merge pull request #7283 from Citadel-Station-13/upstream-merge-38796 
[MIRROR] Fixes emitter runtime
 2018-07-01 09:39:43 -05:00
LetterJay
af5a250ce4 Merge pull request #7282 from Citadel-Station-13/upstream-merge-38779 
[MIRROR] Fixes arrivals shuttle damage message runtime
 2018-07-01 09:39:28 -05:00
LetterJay
42c322ca2c Merge pull request #7281 from Citadel-Station-13/upstream-merge-38789 
[MIRROR] Cleans up leftover telesci teleporter code
 2018-07-01 09:39:08 -05:00
LetterJay
b5b8ce5337 Merge pull request #7280 from Citadel-Station-13/upstream-merge-38751 
[MIRROR] Updates plastic flaps icon and cleans up its code
 2018-07-01 09:38:16 -05:00
LetterJay
2b9aca8143 Merge pull request #7279 from Citadel-Station-13/upstream-merge-38795 
[MIRROR] [s] Fixes PDA ID teleporting
 2018-07-01 09:37:45 -05: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
LetterJay
be23ad6a06 Merge pull request #7277 from Citadel-Station-13/upstream-merge-38656 
[MIRROR] Makes the deconstructable TEG working
 2018-07-01 09:36:57 -05:00
LetterJay
c7b830d2c6 Merge pull request #7276 from Citadel-Station-13/upstream-merge-38834 
[MIRROR] Add welded shut message to vent scrubber
 2018-07-01 09:36:33 -05:00
LetterJay
e1d6ee593b Merge pull request #7275 from Citadel-Station-13/upstream-merge-38800 
[MIRROR] Adds missing armor to accessories
 2018-07-01 09:36:13 -05:00
LetterJay
f7fef5f1ed Merge pull request #7273 from Citadel-Station-13/upstream-merge-38804 
[MIRROR] Adds a colour picker component for circuits
 2018-07-01 09:35:51 -05:00
LetterJay
96fcd9275f Merge pull request #7268 from Citadel-Station-13/kevinz000-patch-9 
boh fix mirror broke
 2018-07-01 09:33:53 -05:00
LetterJay
389faab2a5 Merge pull request #7267 from Citadel-Station-13/upstream-merge-38728 
[MIRROR] Gives honey antibiotic properties
 2018-07-01 09:33:36 -05:00
LetterJay
727aa6b2a9 Merge pull request #7265 from Citadel-Station-13/upstream-merge-38745 
[MIRROR] Fixes not receiving AI destroy objective during IAA
 2018-07-01 09:32:39 -05:00
LetterJay
16eefdd1e6 Merge pull request #7264 from Citadel-Station-13/upstream-merge-38646 
[MIRROR] [Ready]Expands the list of borg-wearable hats
 2018-07-01 09:32:08 -05:00
LetterJay
18b8aad8cb Merge pull request #7262 from Citadel-Station-13/upstream-merge-38690 
[MIRROR] Destructive analyzers can now destroy anything again, even if it has no materials
 2018-07-01 09:31:12 -05:00
LetterJay
7100ae3a7b Merge pull request #7259 from Citadel-Station-13/upstream-merge-38727 
[MIRROR] Prevents reagents being transferred to a bucket while its worn on a head
 2018-07-01 09:30:46 -05:00
LetterJay
74730261b0 Merge pull request #7258 from Citadel-Station-13/upstream-merge-38689 
[MIRROR] Move throwforce up to atom/movable
 2018-07-01 09:30:09 -05:00
LetterJay
de6ae20f87 Merge pull request #7254 from Citadel-Station-13/upstream-merge-38644 
[MIRROR] Port AI static to vis_contents
 2018-07-01 09:29:10 -05:00
LetterJay
fe0c43fea2 Merge pull request #7252 from Citadel-Station-13/upstream-merge-38708 
[MIRROR] Fix runtimes when energy guns are deleted
 2018-07-01 09:28:20 -05:00
LetterJay
35b2338181 Merge pull request #7251 from Citadel-Station-13/upstream-merge-38709 
[MIRROR] Fix being unable to export mechs
 2018-07-01 09:28:03 -05:00
LetterJay
cd842fc20f Merge pull request #7250 from Citadel-Station-13/upstream-merge-38702 
[MIRROR] Remove unused and probably misbehaving admin human manifest spawner
 2018-07-01 09:27:45 -05:00
LetterJay
e54ed36415 Merge pull request #7249 from Citadel-Station-13/upstream-merge-38699 
[MIRROR] Hardsuit helmets protect eyes from pepperspray
 2018-07-01 09:27:07 -05:00
LetterJay
b2fb67c607 Merge pull request #7248 from Citadel-Station-13/upstream-merge-38683 
[MIRROR] Fixes anomaly area selection.
 2018-07-01 09:26:38 -05:00
LetterJay
fb64d5ce71 Merge pull request #7247 from Citadel-Station-13/upstream-merge-38672 
[MIRROR] Fix the MOTD having too many newlines
 2018-07-01 09:26:04 -05:00
LetterJay
3dfeb02512 Merge pull request #7245 from Citadel-Station-13/upstream-merge-38697 
[MIRROR] Improves machine overload logging
 2018-07-01 09:25:40 -05:00
LetterJay
8e21d77c4d Merge pull request #7244 from Citadel-Station-13/upstream-merge-38696 
[MIRROR] fixes a cult message.fixes a cult message.
 2018-07-01 09:25:21 -05:00
LetterJay
605f7a1bf6 Merge pull request #7240 from Citadel-Station-13/upstream-merge-38675 
[MIRROR] Fixed cyborgs not getting their names at round start
 2018-07-01 09:24:46 -05:00
ShizCalev
8c410b92a7 Fixes TGUI runtime (#38797) 
ui_interact was being called on usr instead of M
 2018-07-01 05:44:17 -05:00
ShizCalev
6c89362f60 Fixes emitter runtime (#38796) 
fire() was already handled at 199-204
 2018-07-01 05:44:10 -05:00
ShizCalev
6814022a1b Fixes arrivals shuttle damage message runtime (#38779) 2018-07-01 05:43:51 -05:00
ShizCalev
452b34caa2 Cleans up leftover telesci teleporter code (#38789) 2018-07-01 05:43:43 -05:00
TerraGS
2d3969882a Updates plastic flaps icon and cleans up its code (#38751) 
cl
imageadd: New icon for plastic flaps that actually looks airtight.
code: Update to plastic flaps code to use tool procs rather than attackby and removed two pointless states.
/cl

Gives plastic flaps an airtight look to fit their new property. Removes two defines that were just a functional copy of anchored. Replaces calls to attackby() with screwdriver_act() and wirecutter_act().
 2018-07-01 05:43:01 -05:00
ShizCalev
b523a59ae5 Fixes PDA ID teleporting (#38795) 2018-07-01 05:42:40 -05:00
XDTM
1a56d8243e Potentially fixes monkey fever runtiming on infection (#38776) 2018-07-01 05:42:07 -05:00
Dennok
58f634db63 deconstructable-TEG (#38656) 
Make TEG deconstructable.
 2018-07-01 05:41:53 -05:00
Matt Smith
17d59060ad Add welded shut message to vent scrubber (#38834) 2018-07-01 05:41:43 -05:00
AnturK
18dd26ee3a Adds missing armor to accessories (#38800) 2018-07-01 05:41:32 -05:00
Thunder12345
8c58a28a60 Adds a colour picker component for circuits (#38804) 
* added color picker IC component

* added sprite for color picker
 2018-07-01 05:40:43 -05:00
kevinz000
8b1917f149 Update bag_of_holding.dm 2018-06-27 01:38:36 -07:00
81Denton
f244ec31a0 Gives honey antibiotic properties (#38728) 
* Gives honey antibiotic properties
henk

* 0.6
 2018-06-26 20:30:41 -05:00
Nich
4bbb592e12 Fixes IAA AI destroy objectives (#38745) 2018-06-26 17:02:24 -05:00
zxaber
673ad79a32 [Ready]Expands the list of borg-wearable hats (#38646) 
* Adds the ability to deconstruct empty cyborg shells.

* Update robot_parts.dm

* Update robot.dm

* Update robot.dm

* Update robot.dm

* Update robot_defense.dm

* Update _masks.dm

* Update robot_parts.dm

* Update robot_defense.dm

* replaced type with istype

* Reverting masks.dm

* Removing special snowflake bandana check.

* Update robot_defense.dm

* Added Captain's Crown

By player request.
 2018-06-26 15:54:54 -05:00