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-17 21:32:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,604 Commits 55 Branches 0 Tags
901b93e534a880bb2b014dbbd5f80c149e6ec01a
Commit Graph

526 Commits

Author SHA1 Message Date
BongaTheProto
a3fe975d2c FIxes vapes for snouts (#204) 2021-12-06 22:32:36 -03:00
E
0592520bea fixes runtimes 2021-12-06 20:36:46 +01:00
DrNukesky
b558974e3c Update lewd_datums_extra.dm 2021-12-06 21:33:29 +02:00
DrNukesky
02a1f1b1d2 Update _lewd_extra.dm 2021-12-06 21:32:53 +02:00
StrangeWeirdKitten
c0e3ca5966 Merge branch 'master' into lewd-fixes 2021-12-03 16:54:27 -07:00
StrangeWeirdKitten
04166cd492 Fixes a couple bugs 2021-12-03 16:46:35 -07:00
StrangeWeirdKitten
196cebff53 Merge branch 'master' into Lewd-Clothes 2021-12-02 20:14:16 -07:00
StrangeWeirdKitten
11715f36ba Finishing Touches 
The PR is now finished.
 2021-12-02 19:51:28 -07:00
E
4a89819487 titles 2021-12-02 15:09:16 +01:00
StrangeWeirdKitten
8ea79b0128 latexxx 2021-12-02 05:50:08 -07:00
DrNukesky
d7f50c7aba New job title for assistant 
New "Blacksmith" alt job title added to assistant.

Quite a sounding job title for those who want to do blacksmithing at the station. Plus, it's a pretty good reason to bother the cargo department with ordering a normal anvil.
 2021-12-01 08:43:39 +02:00
BongaTheProto
2e47d1e3e3 Merge branch 'Sandstorm-Station:master' into master 2021-11-30 17:12:27 -05:00
SandPoot
e4e6b41bf7 Update some stuff 2021-11-30 18:07:11 -03:00
StrangeWeirdKitten
e61495c3c4 Mind Collar 2021-11-30 12:14:07 -07:00
StrangeWeirdKitten
01aa0dfc8a Hypnogoogles 2021-11-30 09:35:54 -07:00
StrangeWeirdKitten
9653dca774 Revert "Revert "Lewd Clothes [WIP]"" 
This reverts commit a9bf05e651.
 2021-11-30 07:33:55 -07:00
StrangeWeirdKitten
a9bf05e651 Revert "Lewd Clothes [WIP]" 
This reverts commit 2147cf0623.
 2021-11-30 07:32:37 -07:00
StrangeWeirdKitten
2147cf0623 Lewd Clothes [WIP] 
Ports some stuff from skyrat. Very much a WIP.
 2021-11-29 21:00:28 -07:00
E
73879ad66f fixes gladi not reckognising ashies 2021-11-29 17:42:07 +01:00
E
333f0a7da8 megres with boob 2021-11-29 17:30:51 +01:00
E
1924387f2f minors get sepsis 2021-11-29 15:41:40 +01:00
E
57b3b08896 pull fix 2021-11-29 01:15:58 +01:00
BongaTheProto
88b2ecbfd5 Fixed goat ears 
Now they actually have color + made a small fix for a runtime, delete if it breaks everything even more
 2021-11-28 01:46:44 -05:00
BongaTheProto
d3dde16e2e Merge branch 'Sandstorm-Station:master' into master 2021-11-27 18:00:00 -05:00
BongaTheProto
09d1bebb45 Fixes rings errors (#199) 2021-11-27 19:57:17 -03:00
BongaTheProto
f60fafb3d8 Merge remote-tracking branch 'upstream/better-size-code' into better-size-code-splurt 2021-11-21 00:03:18 -05:00
SandPoot
be30713a2a Fixes circuit harvesting (#198) 2021-11-19 19:20:19 -03:00
Dexxiol
9370f6423c Craftable brass plant and suits. (#197) 
* craftable plant and suits

* Update code/game/objects/items/stacks/sheets/sheet_types.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Update sheet_types.dm

* Update modular_sand/code/game/objects/structures/fauna.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Update modular_sand/code/game/objects/structures/fauna.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Update modular_sand/code/game/objects/structures/fauna.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
 2021-11-19 15:21:37 -03:00
SandPoot
b174c45821 Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13 2021-11-17 22:06:47 -03:00
SandPoot
37e2461945 i forgot this!! aaaaaa 2021-11-17 22:06:40 -03:00
SandPoot
6025ef041b Updates some lewd stuff again (#195) 2021-11-17 15:21:16 -03:00
SandPoot
34900425aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-11-17 13:48:32 -03:00
Dexxiol
8a39aef0fc Resprite of centcom teleporter (#194) 
* Resprite of centcom teleporter

xd

* aighte

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
 2021-11-16 11:26:04 -03:00
SandPoot
d04c8b0dde useless 2021-11-09 14:35:08 -03:00
SandPoot
dc63daf73d Adds demon tail (#191) 2021-11-06 14:46:28 -03:00
SandPoot
377a5da6d6 yeah... wrong. 2021-11-03 18:54:51 -03:00
SandPoot
e467d24d0b Update fleshlight.dm 2021-11-03 17:43:38 -03:00
SandPoot
f753617a0b Updates some lewd stuff (#189) 2021-11-03 13:59:02 -03:00
SandPoot
983fc006a3 Makes interactions generation into a subsystem (#188) 
* Upload files

* Update interactions.dm
 2021-11-01 00:27:07 -03:00
SandPoot
f1f6ac0109 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-31 22:14:23 -03:00
SandPoot
32a6e63698 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-27 23:11:54 -03:00
SandPoot
c4ddc06466 Quick fix 2021-10-15 15:08:40 -03:00
SandPoot
a797436f45 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-15 15:03:21 -03:00
SandPoot
f94c76bea6 Adds fleshlights (#187) 
* Upload files

* Update files

* Update objects.dm

nobody saw this shameful webedit.
 2021-10-12 23:00:03 -03:00
SandPoot
2541ad050b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-10 21:07:48 -03:00
SandPoot
2c4fcaba81 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-06 15:04:36 -03:00
SandPoot
1b851c4826 Thirst rework (#184) 2021-10-02 22:29:34 -03:00
SandPoot
396e7838ad Resizes mechs to be 1.5 of their regular size (#183) 2021-09-21 14:14:00 -03:00
SandPoot
e7d5275a70 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-20 14:32:29 -03:00
SandPoot
2627ae7aa1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-09 23:17:18 -03:00