VerySoft
40a37a814a
Adds in Sheep vore mob.
...
I don't really know how to submit a pull request to the other PR so I just fixxed it here.
I touched up H0lySquirr3l's PR here: https://github.com/VOREStation/VOREStation/pull/11325
I also added the necessary code to make shearing these work, though, it requires the Teppi PR to function, and needs the sprites for shorn sheep, since I know that's a thing that was wanted, so it's commented out right now.
2021-08-15 21:21:51 -04:00
Aronai Sieyes
599c79a0ce
Merge pull request #11415 from VOREStation/upstream-merge-8207
...
[MIRROR] Farmbot can be turned off, not just on
2021-08-13 23:01:20 -04:00
Aronai Sieyes
68043127c9
Mergey fixy merge
2021-08-13 22:44:58 -04:00
Aronai Sieyes
7923f586ab
Merge pull request #11413 from VOREStation/upstream-merge-8201
...
[MIRROR] Dethrone The ERP King
2021-08-13 21:20:19 -04:00
Schnayy
3cd0b17ed9
Farmbot can be turned off, not just on
2021-08-13 18:39:55 -04:00
Schnayy
073fe2a658
Merge pull request #8204 from Cerebulon/ratsratsrats
...
Fixes Rat Description Typo
2021-08-13 18:37:46 -04:00
Schnayy
aa5742d869
Merge pull request #8201 from Cerebulon/erpking
...
Dethrone The ERP King
2021-08-13 18:36:37 -04:00
barrabobabo
2587ebe169
Add default zorren tail to character setup menu ( #11383 )
...
* Add default zorren tail to character setup menu
* Add default zorren tail to character setup menu
* Update code/modules/mob/new_player/sprite_accessories_tail_vr.dm
Co-authored-by: Aronai Sieyes <arokha@arokha.com >
2021-08-13 11:55:28 -04:00
Aronai Sieyes
44748560b6
Merge pull request #11398 from VOREStation/Arokha/przy
...
Przy creations port from Chompers
2021-08-13 11:40:04 -04:00
Ghost Actual
257f18b7ed
Virology Revamp ( #11384 )
...
* Base Commit
* The Manual
* Small Fix
Overlay issue discovered while testing
* Small Fix
* Small Fix
Forgot the Virgo effects in the book
2021-08-13 11:37:41 -04:00
Aronai Sieyes
2833e089fe
Add old sprite as choice
2021-08-13 11:10:57 -04:00
Aronai Sieyes
2488cce1b3
Przy creations port from Chompers
2021-08-13 01:10:33 -04:00
Heroman
f56040f7fa
Linter calming pill
2021-08-11 11:18:09 +10:00
Heroman
face394b62
Fixes infinite material duplication in R&D
2021-08-11 06:57:48 +10:00
Aronai Sieyes
1664cd1a58
Merge pull request #11375 from VOREStation/Arokha/shipnom3
...
Ship eating skybox and emotes tweak
2021-08-09 01:06:24 -04:00
Aronai Sieyes
77def9ca61
Merge pull request #11376 from Hatterhat/nondep-jackets
...
non-departmental jackets
2021-08-09 00:59:09 -04:00
Aronai Sieyes
f74693cd67
Custom emotes work too
2021-08-09 00:56:35 -04:00
Hatterhat
5e2d9d8c67
huh
2021-08-08 23:31:47 -05:00
Hatterhat
7ad08b7b12
single point of failure
2021-08-08 23:07:56 -05:00
Hatterhat
974f6970a8
woo yea grey blue jackets
2021-08-08 23:02:22 -05:00
Aronai Sieyes
1b9e5554b5
Force skybox rebuild when ship eaten
2021-08-09 00:01:33 -04:00
Aronai Sieyes
f25b1a543d
Merge pull request #11373 from VOREStation/Arokha/shipnom2
...
Forgot DME change for ship eating
2021-08-08 23:41:41 -04:00
Aronai Sieyes
00f4adbe5a
Merge pull request #11372 from VOREStation/Fixes/11369
...
Fixes #11369
2021-08-08 23:40:49 -04:00
Aronai Sieyes
82586875c9
And another thing
2021-08-08 23:33:09 -04:00
Aronai Sieyes
1d6ca34b92
Fixes #11369
2021-08-08 23:31:15 -04:00
Aronai Sieyes
dc0ee9c4d8
Merge pull request #11370 from VOREStation/Arokha/shipnom
...
Allows you to eat spaceships
2021-08-08 23:28:29 -04:00
Aronai Sieyes
6c5bde4a35
Allows you to eat spaceships
2021-08-08 23:09:10 -04:00
Heroman
5cba8ecb3a
Fimxes shadekin eyecolors displaying wonkily
2021-08-09 09:36:11 +10:00
Verkister
9c7eb69f72
Finally fixes "It's contains glorping slush"
...
I don't even remember how many years it's been bugging me lmao
2021-08-08 22:15:02 +03:00
Aronai Sieyes
067510fd66
Merge pull request #11360 from VOREStation/Arokha/fancy2
...
Fancy exploration shuttle
2021-08-08 14:47:41 -04:00
Aronai Sieyes
16fde126e6
Fixes #11352
...
Allow promethean boops
2021-08-07 18:39:27 -04:00
Aronai Sieyes
c286dbc7f9
Merge pull request #11356 from VOREStation/Arokha/sipp
...
Allows sipping proteans/prometheans
2021-08-07 17:33:01 -04:00
Ghost Actual
3018ff04b5
CHOMPStation Casino Port ( #11301 )
...
* Create casino.dmi
* Base Commit
* Secondary Commit
* Third Commit
* Final Commit
* Final Final Commit
* Update casino_book.dm
* Update casino_cards.dm
* Update casino_cards.dm
* Update casinocash.dm
* The Claaaaaw
* Power Fix
* fix
2021-08-07 17:32:35 -04:00
Aronai Sieyes
65ed7c1a65
Fancy exploration shuttle
2021-08-06 22:03:46 -04:00
Aronai Sieyes
6133dc6fdd
Merge pull request #11341 from VOREStation/Arokha/fancy_shuttle_done
...
Fancy sprited shuttles
2021-08-06 18:15:14 -04:00
Aronai Sieyes
3f99161430
Merge pull request #11343 from VOREStation/Arokha/erisdrone
...
Port Eris maint drone as option
2021-08-06 18:15:09 -04:00
Aronai Sieyes
42be6302f2
Merge pull request #11355 from GhostActual/fixitfixitfixit
...
Fix for Issue #11354
2021-08-06 18:14:46 -04:00
Aronai Sieyes
74fe48d7d4
Merge pull request #11347 from ResidentCody/phoron-bore-shoots-slower
...
Phoron Bore - Adds Hefty Recoil When Firing
2021-08-06 18:14:30 -04:00
Aronai Sieyes
0901914797
Merge pull request #11342 from VOREStation/Arokha/connectedfancycomps
...
Skyrat connected consoles
2021-08-06 17:46:12 -04:00
Aronai Sieyes
02be2c77a0
Allows sipping proteans/prometheans
2021-08-06 16:33:43 -04:00
klaasjared
201a752543
Base Commit
2021-08-06 14:45:14 -04:00
Aronai Sieyes
bc129a1124
Merge pull request #11338 from GhostActual/new-tanks
...
New Floor Tanks
2021-08-06 11:37:46 -04:00
Novacat
965d3b8b98
Merge pull request #11346 from dwinters99/removal
...
Content removal by request
2021-08-06 11:01:58 -04:00
Novacat
44a11f610a
Merge pull request #11349 from VOREStation/Arokha/barerrerr
...
Make a borer subtype for adminbuse
2021-08-06 11:00:10 -04:00
Aronai Sieyes
e675a165ab
Fixes #11061
2021-08-05 18:37:43 -04:00
Aronai Sieyes
95ac9768eb
Make a borer subtype for adminbuse
2021-08-05 18:32:06 -04:00
Aronai Sieyes
6cb54effc8
Merge pull request #11337 from VOREStation/Arokha/smartrifle
...
SMART Rifle
2021-08-05 17:48:31 -04:00
ResidentCody
d0ca33c7cc
Update bore.dm
2021-08-05 14:59:33 -06:00
Aronai Sieyes
94002bfb77
Merge pull request #11335 from VOREStation/Icons/srrack
...
Skyrat rack sprite
2021-08-05 16:41:26 -04:00
Aronai Sieyes
28dcc4bf60
Merge pull request #11328 from VOREStation/Icons/fieldgen
...
Skyrat field generator sprites
2021-08-05 16:30:15 -04:00
