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 2026-01-29 02:13:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,116 Commits 55 Branches 0 Tags
231da023ec9c073f1644172794de8ef2dc43017e
Commit Graph

2434 Commits

Author SHA1 Message Date
kevinz000
d28754cb4d Merge pull request #8560 from Ghommie/Ghommie-cit37 
Ports in the fix against hitting oneself with one's own thrown items.
 2019-06-08 01:27:43 -07:00
kevinz000
1488af1a52 Merge pull request #8554 from Ghommie/Ghommie-cit33 
Adds AI core screen selection to character preferences and turns icon selection menu into a radial.
 2019-06-08 01:24:59 -07:00
kevinz000
eb1c767ab7 Merge pull request #8553 from Poojawa/ghost-erp 
Clarifies a few things about subtler and how it should be used
 2019-06-08 01:24:36 -07:00
kevinz000
ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29 
Moves traits to datums and turn the accessors into defines
 2019-06-08 01:22:16 -07:00
kevinz000
9edac9fc6c Merge pull request #8540 from BurgerLUA/assssssssssssssssssssssss 
Rebalanced Ass Slapping
 2019-06-08 01:17:04 -07:00
kevinz000
61d0ac9993 Merge pull request #8476 from Trilbyspaceclone/patch-157 
Tweaks/Buffs hierophant
 2019-06-08 01:05:28 -07:00
deathride58
1dde6b90ae Merge pull request #8538 from dtfe3/dtfe3-hair-twintail 
Hair - Long Twintails
 2019-06-08 01:37:29 -04:00
deathride58
8bf5777844 Merge pull request #8474 from Citadel-Station-13/adrenal_nerf 
Adrenal rebalancing/nerfing. Again. And a very slight meth buff.
 2019-06-08 01:07:56 -04:00
deathride58
aa53cc9ea9 Merge branch 'master' into fuckatmos 2019-06-07 04:38:47 -04:00
Ghommie
56be73f7e0 Lord Travis Hath Spoken. 2019-06-07 07:44:33 +02:00
Ghommie
92e925f1f7 Stuff to fix, fools to blame. 2019-06-07 07:14:24 +02:00
Ghommie
455332a717 movin back to the core when selecting a new display. 2019-06-07 04:20:15 +02:00
Ghommie
0b53df47de Enough clowning around. 2019-06-07 03:22:26 +02:00
Poojawa
67eb76b360 clarifies a few things 2019-06-06 18:56:26 -05:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
kevinz000
31a942a63a Merge pull request #8534 from dtfe3/dtfe3-pink-panties 
Pink Panties
 2019-06-06 06:52:57 -07:00
Ghommie
44358e054a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit29 2019-06-06 15:24:31 +02:00
Ghommie
0e630680ba forgot to pull from upstream. One second. 2019-06-06 15:20:27 +02:00
BurgerLua
8778349821 added 2019-06-05 11:43:28 -07:00
dtfe3
3de6e2d71a twintails... 
title
 2019-06-05 19:41:23 +02:00
dtfe3
d1d0f38460 Revert "test" 2019-06-05 19:29:53 +02:00
dtfe3
2e47c973c6 Pink Panties 2019-06-05 16:15:38 +02:00
kevinz000
2c84d75ae6 Merge pull request #8528 from Poojawa/marking-mysteries 
Fixes prosthetic invisible hands, improves female markings
 2019-06-05 02:02:40 -07:00
kevinz000
980c48180c Merge pull request #8387 from JTGSZ/gangs 
Ports gang mode
 2019-06-05 01:55:19 -07:00
kevinz000
89bf36e6a9 Merge pull request #8491 from Ghommie/Ghommie-cit24 
zero, , null, and empty text strings, all fulfill the ! operator.
 2019-06-05 01:52:17 -07:00
kevinz000
adbbb2944a Merge pull request #8517 from Poojawa/shitcode-is-so-bad-and-people-like-it-I-guess 
Adds visible balls and multi-breasts
 2019-06-05 01:42:48 -07:00
kevinz000
58bdac6965 Merge pull request #8524 from BurgerLUA/Ass-Blast-USA 
Adds a trait that makes you immune to ass slapping: BUNS OF STEEL.
 2019-06-05 01:40:28 -07:00
kevinz000
81ba2011d3 Merge pull request #8510 from Sishen1542/ghostmanbad 
Subtle 2: No Ghost Boogaloo
 2019-06-05 01:32:42 -07:00
Poojawa
a2b4f4261c Fixes missing hands and marking overlap 
cleans up the code a bit too. Improves female chest sprites.
 2019-06-05 02:33:25 -05:00
BurgerLua
ed7d0575b2 Ass Blast USA 2019-06-03 14:40:57 -07:00
Poojawa
17ad519f24 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into shitcode-is-so-bad-and-people-like-it-I-guess 2019-06-02 03:00:46 -05:00
Sishen
9347ad57b1 sneaky erp 2019-06-01 20:20:55 -04:00
kevinz000
32f6427cf1 Merge pull request #8434 from Ghommie/Ghommie-cit16 
I'm tired of my pulls on horizontal spacemen breaking off because of crawling delays.
 2019-05-31 18:00:47 -07:00
Ghommie
fa4cf533cb honestly AP bullet spam is ballocks too. 2019-05-30 20:20:05 +02:00
Ghommie
85ab988842 0, null, and "", all fulfill the ! operator. 2019-05-30 20:09:19 +02:00
Trilbyspaceclone
5ead987d53 Update hierophant.dm 2019-05-28 19:01:32 -04:00
Trilbyspaceclone
69a39b4f67 Update hierophant.dm 2019-05-28 18:56:16 -04:00
kevinz000
8cd0b69b61 adrenals 2019-05-28 01:00:41 -07:00
Sishen1542
c57968ec13 Update code/modules/mob/living/carbon/human/species.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-05-28 00:29:56 -04:00
Sishen
6707d1b2fd Update species.dm 2019-05-27 23:24:52 -04:00
Sishen1542
0a11e98950 Update code/modules/mob/living/carbon/human/species.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-05-27 20:53:42 -04:00
Sishen1542
e07493b0fa Update code/modules/mob/living/carbon/human/species.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-05-27 20:53:35 -04:00
Sishen
8771ae5822 masochism and buttslap fixes 2019-05-27 18:51:52 -04:00
kevinz000
76314e463e Merge pull request #8443 from deathride58/stripfix 
Item stripping no longer gets interrupted by changes in your actively held item
 2019-05-27 14:08:04 -07:00
kevinz000
ff82569c6f Merge pull request #8404 from WhiteHusky/flavor-text-bugfix 
Flavor text with special characters don't get partially unescaped
 2019-05-27 03:31:49 -07:00
deathride58
375965d731 Item stripping no longer gets interrupted by changes in your actively held item 2019-05-26 16:22:15 -04:00
Poojawa
84aafb87f9 Lizard tails are actually marked 2019-05-26 04:52:44 -05:00
BurgerLua
125db4c6b4 Added 2019-05-25 21:21:52 -07:00
deathride58
4fc31f6322 Merge branch 'master' into fuckatmos 2019-05-25 15:34:06 -04:00
kevinz000
a4b2aa0420 Merge pull request #8296 from Trilbyspaceclone/patch-112 
Nerfs Synda NPC block Rng to 25%
 2019-05-25 11:31:30 -07:00