Commit Graph

12064 Commits

Author SHA1 Message Date
Cadyn
00bc513e6e Implementing TGSQL security 2021-01-27 10:51:12 -08:00
Cadyn
76ed115e37 Porting TG's SQL 2021-01-25 23:37:49 -08:00
cadyn
70253b582f Merge pull request #1189 from CHOMPStationBot/upstream-merge-9571
[MIRROR] Allows feeding synths with the lewd trait
2021-01-25 16:06:05 -08:00
cadyn
e815dbe29f Merge pull request #1164 from CHOMPStationBot/upstream-merge-9582
[MIRROR] Makes most neutral traits available to all species
2021-01-25 16:02:59 -08:00
Verkister
1e96e1d66d Merge pull request #9571 from VOREStation/Verkister-patch-6
Allows feeding synths with the lewd trait
2021-01-25 22:41:10 +00:00
Novacat
3954bedb9d Merge pull request #9606 from VOREStation/upstream-merge-7834
[MIRROR] fixes some sprites, adds a thin blindfold
2021-01-25 03:09:35 +00:00
cadyn
5b53679fbe Merge branch 'master' into upstream-merge-9582 2021-01-24 09:03:00 -08:00
cadyn
7ce2ef9345 Update neutral.dm 2021-01-24 09:00:50 -08:00
cadyn
c059ff700e Merge pull request #1174 from Sharkmare/drone-unify
Law and subtype preparation for new drones
2021-01-24 08:47:16 -08:00
cadyn
3c541d7ecb Merge pull request #1176 from Darlantanis/VoreSlug
Vore slug and forest turf fix
2021-01-24 08:46:49 -08:00
Darlantan
6b53683dcd Vore slug
Mob, mob icons, random spawn for mob
2021-01-24 11:03:35 -05:00
Darlantan
eb287bb414 Small oversights in leopardmander and pitcher 2021-01-24 11:01:46 -05:00
Sharkmare
15387c5a80 fixing typo in filename 2021-01-24 16:18:12 +01:00
cadyn
199c0602ea Merge pull request #1166 from CHOMPStationBot/upstream-merge-9597
[MIRROR] Removes Herm option for biological gender
2021-01-24 06:50:51 -08:00
Sharkmare
4ed83ee71d Law and subtype preparation for drones
Defines law subsets and typings for drones, this is step 1 of two, second step will be adding back the tool sets for the unique drones
2021-01-24 15:22:29 +01:00
Razgriz
beaf119524 Update station_vr.dm 2021-01-24 01:21:42 -07:00
Novacat
5211edc9c0 Merge pull request #9573 from VOREStation/upstream-merge-7786
[MIRROR] Gadgets & Gizmos
2021-01-24 06:55:05 +00:00
Chompstation Bot
5d4fd0ee29 Removes Herm option for biological gender 2021-01-24 06:44:32 +00:00
Chompstation Bot
9c8634a84b Makes most neutral traits available to all species 2021-01-24 06:33:08 +00:00
cadyn
58e59eaa6b Merge pull request #1149 from Sharkmare/master
Adds Sharkpile prototype + 939
2021-01-22 11:11:38 -08:00
Razgriz
c026b6075e Update hivebot.dm 2021-01-21 19:45:32 -07:00
Razgriz
6347a0a6b5 Hivebot uses 22lr bullet now
Hivebot uses 22lr bullet now
2021-01-21 19:44:42 -07:00
Sharkmare
092a500d3d Disabling poisonining on 939
Almost forgot this
2021-01-21 09:38:52 +01:00
Sharkmare
4d406f66cb Sprites finally added 939
It took a while but now the bois have sprites
2021-01-21 09:21:54 +01:00
Razgriz
a5b86d38e9 Merge pull request #1143 from CHOMPStation2/Razgriz1032-patch-7
Change jellybrig escape chance
2021-01-19 22:19:01 -07:00
Razgriz
19c887aca1 Merge pull request #1142 from cadyn/ballistics-v3.2
Ballistics v3.2
2021-01-19 20:28:31 -07:00
Razgriz
05fd8ae647 Change jellybrig escape chance
From 10% to 2%. Good news it is 50% more likely to escape than to start digesting you.
2021-01-19 20:17:04 -07:00
Cadyn
35543399cd Ballistics v3.2 2021-01-19 17:31:36 -08:00
Razgriz
dafe452b67 Merge pull request #1130 from CHOMPStationBot/upstream-merge-9580
[MIRROR] Allows every species to select any biological sex.
2021-01-19 15:35:23 -07:00
Razgriz
3434d0117f Update station_vr.dm 2021-01-19 15:25:47 -07:00
Razgriz
296cb6e3dc Update station_vr.dm 2021-01-19 15:01:44 -07:00
LunarFleet
51bbf52c40 The holy one line edit 2021-01-18 19:22:40 -05:00
Nadyr
b95c39e483 Merge pull request #1129 from CHOMPStationBot/upstream-merge-9581
[MIRROR] Makes me's in oldchat not be italicized
2021-01-16 20:09:03 -05:00
Razgriz
72af6e6f23 Merge pull request #1117 from CHOMPStationBot/upstream-merge-9564
[MIRROR] [MIRROR] Blob Genesis
2021-01-16 18:05:40 -07:00
Nadyr
d4454a93be Merge pull request #1128 from CHOMPStationBot/upstream-merge-9579
[MIRROR] Allows Custom Species to select any of 5 physical genders.
2021-01-16 20:04:06 -05:00
Nadyr
e0a2524187 Merge pull request #1127 from CHOMPStationBot/upstream-merge-9578
[MIRROR] Some minor shadekin adjustments
2021-01-16 20:02:52 -05:00
Nadyr
0909de94f4 Merge pull request #1126 from CHOMPStationBot/upstream-merge-9576
[MIRROR] Fixes custom borg sprites.
2021-01-16 20:01:44 -05:00
Chompstation Bot
b24c617b89 Allows every species to select any biological sex. 2021-01-17 00:00:40 +00:00
Novacat
ae3ece269d Merge pull request #9581 from Heroman3003/STOP-THE-ITALICS
Makes me's in oldchat not be italicized
2021-01-16 23:48:15 +00:00
Novacat
3a2e98e470 Merge pull request #9579 from Heroman3003/custom-genderization
Allows Custom Species to select any of 5 physical genders.
2021-01-16 23:47:05 +00:00
Novacat
9e27153990 Merge pull request #9578 from Heroman3003/shadekin-minor-stuff
Some minor shadekin adjustments
2021-01-16 23:45:55 +00:00
Novacat
4e489576c1 Merge pull request #9576 from VOREStation/Verkister-patch-8
Fixes custom borg sprites.
2021-01-16 17:53:12 +00:00
Novacat
2ae8d86416 Merge pull request #9575 from Verkister/chonkies
More chubby oties
2021-01-15 17:14:37 +00:00
Razgriz
7def8d336e Merge pull request #1111 from CHOMPStationBot/upstream-merge-9565
[MIRROR] [MIRROR] Corpse Landmarks Update pt1
2021-01-13 22:16:02 -07:00
Razgriz
0303df5b07 Merge pull request #1110 from BlackMajor/gut
Belly Filler 2: Electric Boogaloo, the Turniping
2021-01-13 22:14:27 -07:00
Chompstation Bot
6ddd2efb7b [MIRROR] Blob Genesis 2021-01-13 00:22:31 +00:00
Shadow-Quill
f46a23f982 Update emote.dm 2021-01-12 17:25:10 -05:00
Shadow-Quill
e2c6046ce4 Update emote.dm 2021-01-12 17:03:26 -05:00
Shadow-Quill
936c7acfa8 Update emote.dm 2021-01-12 16:40:17 -05:00
Novacat
6be0583994 Merge pull request #9565 from VOREStation/upstream-merge-7801
[MIRROR] Corpse Landmarks Update pt1
2021-01-12 03:53:39 +00:00