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
34,856 Commits 55 Branches 0 Tags
26fee48cecf120fb9359196636e4f2cfa7af03df
Commit Graph

2294 Commits

Author SHA1 Message Date
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
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
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
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
SiliconMain
1f4340103e Update suit.dm 2020-05-18 07:06:21 -05:00
Ghom
20ac2f26f4 Demodularizing the gear loadout code a little. (#12261) 2020-05-18 04:45:50 -07:00
Ghom
68cd016067 Demodularizing wishgranter, some helpers, and removing unused files. (#12291) 2020-05-17 17:06:05 -07:00
Ghom
08280a853e Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers' (#12282) 
* Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers'

* Ok, signals.
 2020-05-17 17:04:15 -07:00
Ghom
7c7147cb3e Field of Vision component. (#12075) 
* Hopeless WIP for vision cones.

* Core component and hooks done

* Removing clutter.

* linter bashing me for using statements as args.

* Ok.

* continue

* bring back the macro

* Configs and openspace filter.

* Chat plane, reset perspective signal, mechs/vehicles cases, machineries.

* view, viewers and spoopy ghosts.

* Renamed component, admin fun button and snowflakes robots.

* Whoopsie.

* Yikes

* test merge tweak.

* radial yaketi sax.

* Fixed tgui UIs, some messages not displayed to the target.

* Documentation and a little bugfix.

* Pulling QoL, seventh plane made in this PR.

* Fix.

* Tweaks and improvements.

* Update randomverbs.dm
 2020-05-15 15:25:04 -07:00
kevinz000
ff2158b20b Merge pull request #12206 from Ghommie/Ghommie-cit742 
Porting tg's icon for that plant-speak language.
 2020-05-12 12:28:08 -07:00
kevinz000
395d434e6e Merge pull request #12200 from Ghommie/Ghommie-cit738 
nutrition adjustment wrapper procs from tg.
 2020-05-12 12:28:02 -07:00
kevinz000
afbbde610a Merge pull request #12201 from Ghommie/Ghommie-cit740 
Purging unused dogborg items.
 2020-05-12 12:27:26 -07:00
Ghommie
7109851089 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit742 2020-05-11 00:46:51 +02:00
Ghommie
b229386efa Porting tg's icon for that plant-speak language. 2020-05-11 00:23:36 +02:00
kevinz000
1cf2311930 Merge pull request #12164 from Ghommie/Ghommie-cit733 
Porting "Refactors language holder"
 2020-05-10 14:16:42 -07:00
Ghommie
5ed6a18ef7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit740 2020-05-10 22:36:04 +02:00
Ghommie
e0b91c53af Purging unused dogborg items. 2020-05-10 22:17:05 +02:00
Ghommie
667c12d413 nutrition adjustment wrapper procs. 2020-05-10 21:41:50 +02:00
Lin
dd7db603d2 Merge pull request #12159 from Ghommie/Ghommie-cit732 
'mob_run_block' and 'mob_check_block' macros
 2020-05-10 18:25:16 +00:00
Putnam3145
c20c7f0698 Removes crocin, hexacrocin from emagged booze dispenser; makes crocin no longer "roofies" (??) (#12177) 
* Removes crocin, hexacrocin from emagged booze dispenser

* what. what. what. what. what.
 2020-05-09 14:34:30 +02:00
kevinz000
407b1c7447 Merge remote-tracking branch 'citadel/master' into projectiles_2 2020-05-08 23:32:01 -07:00
kevinz000
19072abe37 compile 2020-05-08 23:01:05 -07:00
Ghommie
2858ddd90b Porting "Refactors language holder" 2020-05-08 22:44:02 +02:00
Ghommie
a412e840f7 'mob_run_block' and 'mob_check_block' macros 2020-05-08 18:52:32 +02:00
Ghommie
192c0dcc1a Demodularizing the arousal module. 2020-05-08 03:35:29 +02:00
Putnam3145
e36bd50ad9 Makes G gluid calcs only happen when it's required (#12095) 
* Made G fluid calcs only happen on moment it's required.

* whoops

* Update modular_citadel/code/modules/arousal/organs/testicles.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-04 05:08:01 +02:00