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
35,811 Commits 55 Branches 0 Tags
6fca9af0ed147b2fc81db07140da9ff4b6daf251
Commit Graph

2317 Commits

Author SHA1 Message Date
Lin
6fca9af0ed Merge pull request #12848 from silicons/morecolors 
species customization now allows 16 million colors instead of 4 thousand
 2020-07-23 13:28:50 -05:00
silicons
e1afca8617 Merge pull request #12845 from YakumoChen/MKUltra-Fix 
Mk ultra fix
 2020-07-22 02:30:43 -07:00
silicons
744b6d6b48 Merge pull request #12851 from zeroisthebiggay/fetishcontentfetishcontent 
maid fetish content pr
 2020-07-21 19:20:52 -07:00
zerothebigboy
fb35248e3b a 2020-07-21 02:24:22 -04:00
silicons
87d53957bf sigh 2020-07-20 20:09:13 -07:00
YakumoChen
8adfe633e3 Fixes MK 2020-07-21 01:27:22 +00:00
silicons
267186a5d3 Merge pull request #12646 from Chiirno/emi 
[READY] Alt-click cigarette pack functionality added to pill bottles.
 2020-07-20 16:15:38 -07:00
Lin
ba3dc6a73b Merge pull request #12679 from silicons/unarmed_parry 
Ok ok hear me out: Implements unarmed parry.
 2020-07-18 17:02:02 -05:00
silicons
044525519a Merge pull request #12750 from timothyteakettle/loadout-plushies 
replaces plushies in the loadout menu with a choice box
 2020-07-17 17:10:14 -07:00
silicons
993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
DeltaFire
ac2dd85743 runtime fixies 2020-07-14 18:25:13 +02:00
Timothy Teakettle
c3d490a803 very cool 2020-07-12 20:15:57 +01:00
silicons
6cbab55ef8 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-07 21:07:58 -07:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Ghommie
e12c3382de undefined variable. 2020-07-05 03:48:41 +02:00
Ghommie
562b57095d mowing down the experimental cloner copypasta. 2020-07-05 03:04:53 +02:00
Cirno
020da9fa07 i hope this works 2020-07-04 15:47:38 -03:00
silicons
434a53340b groan 2020-06-30 20:21:59 -07:00
Ghommie
9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
Ghom
b280c0f550 Merge pull request #12622 from timothyteakettle/grammar-fixes 
big batch of spelling/grammar corrections
 2020-06-29 21:13:06 +02:00
Lin
1966c6daca Merge pull request #12595 from silicons/squish 
*squish
 2020-06-29 13:11:38 -05:00
Ghom
a749dab2b2 Merge pull request #12623 from Citadel-Station-13/silicons-patch-7 
i would appreciate it if outgoing mentorpms didn't sear my eyes out of my head
 2020-06-29 19:30:49 +02:00
silicons
90e9a647ed Update mentorpm.dm 2020-06-26 22:39:17 -07:00
timothyteakettle
76b5557e1e bunch of grammar corrections 2020-06-27 02:12:44 +01:00
b1tt3r1n0
38153a2cbe Fuck abuse of mechanics, fermi chem edition. 2020-06-25 21:20:58 -04:00
Funce
669120ee72 Add proper deletion to mentor SQL queries 2020-06-25 09:05:09 +12:00
silicons
800825f9f7 squish 2020-06-24 11:02:47 -07:00
silicons
9f6d0ba10b Merge pull request #12570 from NopemanMcHalt/orvilike_bonus 
Adds Kepi and Orvilike Kepi
 2020-06-24 08:43:03 -07:00
Ghommie
de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
Anonymous
9e7b884e86 Adds remaining TOSOrvikepi 2020-06-21 13:25:23 +03:00
Anonymous
45dab7fa66 Kepi and Orvilike Kepi 2020-06-20 22:52:33 +03:00
kevinz000
78fadafa05 alright 2020-06-17 21:44:49 -07:00
Timothy Teakettle
7fbfb4ad0e Merge remote-tracking branch 'upstream/master' into embed-changes 2020-06-15 22:48:26 +01:00
YakumoChen
2473308b4d Adds polychrome uniforms to loadout / kinkmate (#12506) 
* adds revealing poly outfits to kinkmate

* Using unused poly uniforms

* adds polychrome to kinkmate
 2020-06-12 17:07:48 -07:00
Timothy Teakettle
38bf529f3c a tonne of fixes 2020-06-11 20:18:36 +01:00
Timothy Teakettle
8ec5672b85 tonne of fixes 2020-06-10 21:14:08 +01:00
Trilbyspaceclone
81070b8ada New fermi chem Zeolites! (#12428) 
* Zeolites!

* No loner hs debug numbers...
 2020-06-09 03:25:40 -07:00
Timothy Teakettle
3692323615 plushmium: the fermichem that creates sentient plushies (#12450) 
* create plushie mob and chem

* better plush

* sentience

* fixes

* more fixes

* spelling error

* okay this works better

* more work on sentiency

* fixes

* further fixes

* revert plush storage changes, add splash effect

* fix icons

* undo a change that i guess isnt needed

* remove spaces

* plushies are now space immune

* make warning text more clear

* dont give them more health than bears?

* give them 0/1 stamina damage

* bugfix

* squeak when attacked

* small refactor
 2020-06-09 03:21:18 -07:00
NopemanMcHalt
e5bc651140 Station has a crew loose (Adds Orville-inspired(?) uniform) (#12447) 
* Station has a crew loose

Also adds paramedic to the MedSci Trekkie list
And allows chaplain to wear UniFed Service uniform

* hotfix for digi ops
 2020-06-08 09:14:19 -07:00
Yawet330
fabfd684ce Silicon Flavortexts. (SCRUTINISE HEAVILY) (#12395) 
* Part 1 - Adding the component

* Part 2 - Making the WRITE_FILE before changing the pref menu.

* Part 3 - Mirroring existing code, instead of tacking it on because im both lazy, and want a distinction

* Part 4 - Changes the preference tab to accomodate this.

* we made a brief fucky wucky!

* make it look noice

* fuckywucky mk2

* Part 5 - make it apart of the helper list (woops)

* that'yll do it.

* maybe fix?

* nope, just hit the delete button on their flavortext entirely :agony:

* Update preferences_savefile.dm

* Update silicon.dm

* Update preferences.dm

* Update silicon.dm
 2020-06-04 15:53:39 -07:00
Ghom
a41f40503d More lenient soft stamina combat, decentralized gun inaccuracy from combat mode. (#12347) 
* A more lenient soft stamina crit.

* Yea, your shots are gonna go straight toh.

* accuracy whacks (leaves the bow as is for now).

* Fixing stam penalties calculations, spread the range.

* aaaaaah

* 1.4 seconds delay vs 1.2

* Thanks, linter.

* Missed one.
 2020-06-02 15:22:06 -07:00
Ghommie
1bca74465f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-30 03:29:02 +02:00
Ghom
968426fd48 Combat mode component. (#12338) 
* Combat mode component.

* Whoops.

* test.

* Oh

* refs begone, and documentation.
 2020-05-27 18:00:32 -07:00
Lin
ad57647e64 Merge pull request #12173 from kevinz000/projectiles_2 
Refactors projectile speed to pixels per second
 2020-05-24 21:21:41 +00:00
Ghom
07df0102f8 Demodularizing a few reagents, a client var, the rest hud button. (#12329) 2020-05-24 13:21:14 -07:00
Ghommie
a84e7bcecc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-24 04:00:51 +02:00
Lin
c857dc9cd1 Merge pull request #12321 from Ghommie/Ghommie-cit779 
Makes fermichem properly logged in the reagents logs, tiny astrogen fix.
 2020-05-22 21:36:00 +00:00
Lin
4ee5d0cb37 Merge pull request #12296 from kevinz000/paracoat 
Adds a paramedic wintercoat
 2020-05-21 19:26:31 +00:00
Ghommie
22d2200fc1 aaa 2020-05-21 03:20:22 +02:00
Ghommie
50171db408 Makes fermichem properly logged in the reagents logs, tiny astrogen fix. 2020-05-21 03:04:26 +02:00