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-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,448 Commits 55 Branches 0 Tags
dbcc95ea28d08bd4ba05f1ae87c60bad2acdf79c
Commit Graph

9274 Commits

Author SHA1 Message Date
Lin
dbcc95ea28 Merge pull request #14262 from timothyteakettle/lawyer-message-all-href 
stops people using Message All on PDAs when their cartridge doesn't allow it
 2021-02-18 23:34:11 -06:00
Timothy Teakettle
746ca01823 Update code/game/objects/items/devices/PDA/PDA.dm 
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
 2021-02-19 02:10:03 +00:00
Lin
3b9f1cb4ec Merge pull request #14239 from Hatterhat/golem-gps-pass2 
well that's what i get for trusting my own code - makes golem GPSes start off, but actually this time
 2021-02-17 17:29:03 -06:00
Timothy Teakettle
96d80901e4 Update PDA.dm 2021-02-17 17:26:45 +00:00
silicons
e009b9ef5f Merge pull request #14186 from SmArtKar/trading_card_game 
[READY][PORT] Codename: Blue Eyes White Jumpsuit, the Citadel TCG. Part 1
 2021-02-17 01:30:13 -07:00
SmArtKar
e4afe49687 Adds card crafting!" 2021-02-16 19:38:48 +03:00
timothyteakettle
8f0fbb75ac Update security.dm 2021-02-14 22:21:11 +00:00
Hatterhat
c5a9a8905a actually makes golem gpses start off 2021-02-13 15:20:24 -06:00
silicons
76837ee0b6 Merge pull request #14225 from Hatterhat/dth-kit-pass2 
[hello if someone could fight the maintainers to take a look that'd be great] fixes durathread armor kits
 2021-02-12 18:54:36 -07: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
Hatterhat
8103078ff1 second pass pt2 2021-02-11 00:29:25 -06:00
Hatterhat
3040eca4e0 holy shit what was i thinking god FUCK durathread 2021-02-11 00:20:49 -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
silicons
e8da810cd3 Merge pull request #14205 from keronshb/warpimplant-adjustment 
Triples Warp Implant's cooldown
 2021-02-10 02:08:57 -07:00
silicons
ca906eb683 Merge pull request #14208 from dzahlus/grenadelaunch.ogg 
sound PR oversights fix
 2021-02-10 02:07:57 -07: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
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
dzahlus
b3ab2722f0 fug 2021-02-08 14:48:53 +01:00
dzahlus
6dabe348fa fixes oversights 
fixes grenadelauncher.ogg being used where it shouldnt FOR GOOD NOW I SWEAR. Bokken sound fixed, mech weapons now use proper sound too
 2021-02-08 14:43:33 +01:00
keronshb
38827122e9 Adjusts warp implant to 30 second delay 
who thought this was a good idea
 2021-02-07 23:50:42 -05:00
keronshb
952d2e1e60 Removes the power sink objective 
Alternative to the other PR
 2021-02-07 23:41:27 -05:00
silicons
cf4a5f3388 Merge pull request #14189 from dzahlus/diversify-sound 
Diversify weapon sound
 2021-02-06 11:42:36 -07:00
silicons
86066450f3 Merge pull request #14179 from TyrianTyrell/master 
Signed language (Requested changes complete)
 2021-02-06 11:42:24 -07:00
silicons
d4f978c6db Merge pull request #14172 from keronshb/cell-charger-upgrade 
Cell Charger Buffs
 2021-02-04 12:50:30 -07:00
silicons
993a849700 Merge pull request #14155 from SmArtKar/tgui_observe 
Port of TG's "Auto Observe"
 2021-02-04 12:49:09 -07:00
SmArtKar
2135a391dc More cards? More cards! 2021-02-04 19:03:03 +03:00
SmArtKar
2cd339f776 Adds Card Ops bundle 2021-02-04 18:57:00 +03:00
dzahlus
84207813b7 rework of present sounds 
Reworks already present sounds in the game, specifically of the folder "weapons"
 2021-02-02 23:28:53 +01:00
TyrianTyrell
4f5f0eec07 Update radio.dm 2021-01-31 14:19:04 -05:00
TyrianTyrell
cfa169293c Update radio.dm 2021-01-31 14:17:53 -05:00
TyrianTyrell
318f34be78 Update headset.dm 2021-01-31 14:15:40 -05:00
keronshb
10c0e40d71 Removes extra update icon 
Removes extra update icon
 2021-01-30 14:40:11 -05:00
keronshb
f85accc406 Upgrades cell chargers 
Similar to weapon cell chargers
 2021-01-30 13:26:45 -05:00
DeltaFire
c417d576ec Merge pull request #14152 from Arturlang/turret_fixing_redo 
Brings back turret fixing
 2021-01-30 19:10:10 +01:00
Hatterhat
4525b1b64f ooOOooOO today i wont test my code again 2021-01-29 20:19:58 -06:00
silicons
1974f2b41d Merge pull request #14148 from zeroisthebiggay/whytho 
gives the advanced extinguisher a sprite that doesn't look like total dogshit even by codersprite standards
 2021-01-29 07:29:28 -07:00
SmArtKar
a7bc066891 Auto-Observe! 2021-01-28 17:09:28 +03:00
Artur
f2343b32fe Brings back turret fixing 2021-01-28 09:39:21 +02:00
zerothebigboy
e7d8021b81 a 2021-01-27 18:46:11 -05:00
Lin
b1b5adb90d Merge pull request #14086 from Citadel-Station-13/silicons-patch-25 
officially adds the functionality to insert holdable mobs into colormate
 2021-01-27 17:18:29 -06:00
Lin
f7c1cdc571 Merge pull request #14112 from silicons/ex_act_3 
~~hugboxes~~ fixes the bug (that was probably my fault) that makes 1 dev explosions ALWAYS delete brain
 2021-01-27 17:16:44 -06:00
Lin
4e3a4a30c3 Merge pull request #14139 from Citadel-Station-13/silicons-patch-2 
small refactor to pinpointers, allow pinpointers with custom targets
 2021-01-27 17:16:09 -06:00
Putnam3145
2765aed0b4 Merge pull request #14085 from Citadel-Station-13/silicons-patch-24 
ok as funny as this is, painting pets in gear painters is the result of a potentially awful bug regarding mob holder drop logic
 2021-01-26 22:24:57 -08:00
silicons
0a5ad34fd6 Update pinpointer.dm 2021-01-26 07:26:59 -07:00
silicons
93ff29a579 Update pinpointer.dm 2021-01-26 00:00:39 -07:00
silicons
6a2ae34ebe Merge pull request #14111 from Arturlang/revenant_TK 
[READY]Gives the revenant TK
 2021-01-25 23:17:09 -07:00
silicons
b77cc68e8d Merge pull request #14133 from Hatterhat/depcards-nobody-asked-for 
department budget cards but not in lockers
 2021-01-25 23:02:11 -07:00
silicons
de8d778f76 Merge pull request #14134 from Arturlang/Give_improvements 
[READY]Give Improved
 2021-01-25 23:02:03 -07:00