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 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,288 Commits 55 Branches 0 Tags
5d001fc4b3c34b8af995c795ac6d9bcd2473bd71
Commit Graph

41288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vynzill
5d001fc4b3 rice hat fix 2021-02-12 16:13:59 -06:00
Vynzill
3d7e74ba66 less loot more danger 
touches stuff up, removes gamer loot, buffs a frog and adds apes.
 2021-02-11 23:44:54 -06:00
CitadelStationBot
891f00bc48 Automatic changelog generation for PR #14166 [ci skip] 2021-02-11 22:06:50 -06:00
DeltaFire
1ea3aafa10 Merge pull request #14166 from Hatterhat/ebola-nerf 
energy bola nerf - reduced breakout time (6 sec -> 2.5), deletes on remove
 2021-02-12 05:06:48 +01:00
Hatterhat
7ec692ef60 this is good...isn't it? 2021-02-11 19:08:29 -06:00
CitadelStationBot
f9576c1fd1 Automatic changelog generation for PR #14223 [ci skip] 2021-02-11 19:02:47 -06:00
Lin
61877a3d1c Merge pull request #14223 from timothyteakettle/quieten-a-log 
changes a migration error to use log_game instead of message_admins
 2021-02-11 19:02:44 -06:00
Changelogs
733a2509fe Automatic changelog compile [ci skip] 2021-02-12 00:13:18 +00:00
DeltaFire
456219003c Merge pull request #14228 from silicons/tgui_recompile 
TGUI recompile
 2021-02-11 15:37:27 +01:00
silicons
423fcaa70a tgui_recompile 2021-02-11 04:57:35 -07:00
silicons
8bdf0b98a8 Merge pull request #14213 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/marked-2.0.0 
Bump marked from 1.1.1 to 2.0.0 in /tgui
 2021-02-11 04:51:31 -07:00
CitadelStationBot
251bf42d71 Automatic changelog generation for PR #14220 [ci skip] 2021-02-10 22:00:19 -06:00
DeltaFire
a041445bd5 Merge pull request #14220 from Hatterhat/what-atvs-question-mark 
what atvs? - replaces the snowcabin ATVs with snowmobiles
 2021-02-11 05:00:16 +01:00
CitadelStationBot
aad2a3e852 Automatic changelog generation for PR #14221 [ci skip] 2021-02-10 21:33:33 -06:00
DeltaFire
6bcee44179 Merge pull request #14221 from MrJWhit/delta-station-fix 
Random delta station fix
 2021-02-11 04:33:30 +01:00
CitadelStationBot
2c67be1737 Automatic changelog generation for PR #14206 [ci skip] 2021-02-10 21:32:40 -06:00
DeltaFire
7259f53160 Merge pull request #14206 from Citadel-Station-13/silicons-patch-10 
Nerfs VoG stun, knockdown, vomit. Removes sleep command.
 2021-02-11 04:32:37 +01:00
CitadelStationBot
c0c0455a6e Automatic changelog generation for PR #14218 [ci skip] 2021-02-10 21:27:50 -06:00
DeltaFire
3e3dc44cd2 Merge pull request #14218 from MrJWhit/box-station-vault 
Gives boxstation vault door actual vault door access
 2021-02-11 04:27:47 +01:00
Changelogs
cabcc94969 Automatic changelog compile [ci skip] 2021-02-11 00:14:09 +00:00
Timothy Teakettle
d858c420aa Update preferences_savefile.dm 2021-02-10 23:18:53 +00:00
dependabot[bot]
e5562f6cb6 Bump marked from 1.1.1 to 2.0.0 in /tgui 
Bumps [marked](https://github.com/markedjs/marked) from 1.1.1 to 2.0.0.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/release.config.js)
- [Commits](https://github.com/markedjs/marked/compare/v1.1.1...v2.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-10 09:12:51 +00:00
CitadelStationBot
13e0131cf8 Automatic changelog generation for PR #14211 [ci skip] 2021-02-10 03:09:54 -06:00
silicons
c8cf061773 Merge pull request #14211 from timothyteakettle/better-logging 
pickpocketing is now logged outside of hrefs
 2021-02-10 02:09:50 -07:00
silicons
c9d917b22d Merge pull request #14201 from dzahlus/flechette-buff 
Flechette Rifle/CX Shredder now work with wounds
 2021-02-10 02:09:38 -07:00
CitadelStationBot
3b38c6af10 Automatic changelog generation for PR #14202 [ci skip] 2021-02-10 03:09:32 -06:00
silicons
4b089f3514 Merge pull request #14202 from DeltaFire15/robo-vendor 
Adds nanogel to the robodrobe
 2021-02-10 02:09:29 -07:00
CitadelStationBot
7260843691 Automatic changelog generation for PR #14203 [ci skip] 2021-02-10 03:09:23 -06:00
silicons
74a7c1e9fb Merge pull request #14203 from zeroisthebiggay/patch-4 
makes the a.sterile mask no longer hide your face
 2021-02-10 02:09:20 -07:00
CitadelStationBot
fb76225a40 Automatic changelog generation for PR #14204 [ci skip] 2021-02-10 03:09:12 -06:00
silicons
f0f9a865e6 Merge pull request #14204 from keronshb/powersinkobj-removal 
Removes the Power Sink Objective
 2021-02-10 02:09:09 -07:00
CitadelStationBot
5045aff802 Automatic changelog generation for PR #14205 [ci skip] 2021-02-10 03:09:00 -06:00
silicons
e8da810cd3 Merge pull request #14205 from keronshb/warpimplant-adjustment 
Triples Warp Implant's cooldown
 2021-02-10 02:08:57 -07:00
CitadelStationBot
9d0313b447 Automatic changelog generation for PR #14208 [ci skip] 2021-02-10 03:08:00 -06:00
silicons
ca906eb683 Merge pull request #14208 from dzahlus/grenadelaunch.ogg 
sound PR oversights fix
 2021-02-10 02:07:57 -07:00
CitadelStationBot
ac2c1e6c1f Automatic changelog generation for PR #14216 [ci skip] 2021-02-10 03:07:52 -06:00
silicons
7c27de3735 Merge pull request #14216 from timothyteakettle/blood-fixes 
corrects two persistent blood related issues
 2021-02-10 02:07:49 -07:00
CitadelStationBot
ca3f48972c Automatic changelog generation for PR #14215 [ci skip] 2021-02-10 03:07:40 -06:00
silicons
ec2ae053ce Merge pull request #14215 from Putnam3145/readied-only 
Added a config to disallow unreadied players from voting on modes
 2021-02-10 02:07:37 -07:00
CitadelStationBot
7bc503d66c Automatic changelog generation for PR #14214 [ci skip] 2021-02-10 03:07:29 -06:00
silicons
c82f0a4f5b Merge pull request #14214 from Adelphon/gclothing 
Clothing PR
 2021-02-10 02:07:27 -07:00
MrJWhit
dba9fd7134 Update DeltaStation2.dmm 2021-02-10 00:04:44 -05:00
Hatterhat
fc88f27c85 what atvs? 2021-02-09 22:40:00 -06:00
MrJWhit
94b507dbf3 Update BoxStation.dmm 2021-02-09 16:31:58 -05:00
silicons
5c54bf39e7 Merge pull request #14217 from timothyteakettle/why 
[s] why
 2021-02-09 02:51:44 -07:00
Timothy Teakettle
09fdb5f83a Update apc_control.dm 2021-02-09 09:48:17 +00:00
Timothy Teakettle
5ebdb6deec yes 2021-02-09 09:37:17 +00:00
Putnam
7a6ed7f500 Added a config to disallow unreadied players from voting on modes/storytellers 2021-02-08 22:59:49 -08:00
Adelphon
28d1f93b1c Clothing PR 
I added two clothing that I made.
 2021-02-09 00:41:11 -05:00
Changelogs
69e4f7ff84 Automatic changelog compile [ci skip] 2021-02-09 00:13:10 +00:00