cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 12:50:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,473 Commits 9 Branches 26 Tags
6ebff50f04ca30dfd640d872faddb2f46ca303b8
Commit Graph

22753 Commits

Author SHA1 Message Date
JoanRisu
6ebff50f04 The Next Batch 
scree:Scree:/obj/item/clothing/under/fluff/screesuit
molenar:Giliana
Gamish:/obj/item/clothing/suit/storage/toggle/labcoat/fluff/molenar

Needs to be added to custom items config list:
adk09:Lethe:/obj/item/clothing/head/helmet/hos/fluff/lethe

Item entries done, just needs a modkit:
scree:Scree:/obj/item/device/modkit_conversion/fluff/screekit

General custom items added:
/obj/item/clothing/suit/space/void/security/fluff/hos // ToDo: Rig
version.
/obj/item/clothing/head/helmet/space/void/security/fluff/hos // ToDo:
Rig version.
All Animatronic suits
 2016-05-14 02:32:50 -07:00
Arokha Sieyes
df711353d2 yup 2016-05-14 00:18:43 -04:00
Arokha Sieyes
2c2362e8b0 Made tails go 2016-05-14 00:17:30 -04:00
Leshana
0139e2a7c2 External organ sprites need to handle species that use ICON_MULTIPLY 2016-05-13 23:22:24 -04:00
Arokha Sieyes
4d9f5ba890 Fixing tail sprites slightly 2016-05-13 23:21:27 -04:00
Leshana
07806744b9 Merge pull request #53 from VOREStation/9000guns 
custom_guns.dm port
 2016-05-12 22:13:13 -04:00
Leshana
2dbf831f8d Merge pull request #47 from VOREStation/ianhats 
Sets up Ian hats
 2016-05-12 22:09:46 -04:00
Arokha Sieyes
8aee7bc751 Merge pull request #51 from VOREStation/setup-screen 
Adds micro/macro and weight gain options to the character setup screen.
 2016-05-12 22:07:30 -04:00
Arokha Sieyes
817c805e02 Merge branch 'master' into 9000guns 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
 2016-05-12 22:03:58 -04:00
Arokha Sieyes
04ef9305ff Finishing up custom_guns.dm port 2016-05-12 21:57:40 -04:00
Leshana
8501247cf9 Resolves Issue #20 - Gas Meter Convenience 
* Changed gas meters to be readable merely by left-clicking, instead of having to examine.  This behavior was present on oldcode and was nice, so bringing it back.
* Changed readability distance to 5 tiles for the sake of convenience.
 2016-05-12 21:54:26 -04:00
Leshana
80a95b0cf5 Adds micro/macro and weight gain options to the character setup screen. 
Moves the location of saved micro/macro variables to the main /datum/preferences for ease of use.
 2016-05-12 21:38:41 -04:00
Arokha Sieyes
c001f471e3 More work on guns 2016-05-12 21:06:55 -04:00
Arokha Sieyes
5d1d5b6bf8 custom_guns.dm mostly ported 2016-05-12 16:54:04 -04:00
Arokha Sieyes
8cce41bf84 Adds anti-tamper to crates and adds anti-tamper 1 to abandoned ones. 
Also fixes a minor thing they did to species, renamed a flag.
 2016-05-12 14:14:01 -04:00
Arokha Sieyes
17a64bebea Merge branch 'master' of https://github.com/PolarisSS13/Polaris into breakfix 
# Conflicts:
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/new_player/new_player.dm
#	vorestation.dme
 2016-05-12 13:02:51 -04:00
Arokha Sieyes
68796d4e6a Don't nag me, game. 2016-05-12 12:29:28 -04:00
Arokha Sieyes
cc05c85051 Sets up Ian hats 
Copied from old code mostly. A few minor tweaks to improve UE.
 2016-05-12 12:03:08 -04:00
Datraen
9e116ea887 Merge pull request #1625 from Yoshax/vendingmachines 
Vending machine changes and fixes
 2016-05-12 11:23:25 -04:00
HarpyEagle
8f659e2263 Adds a sleep(3) between the vending of two items for effect. 2016-05-12 15:57:23 +01:00
GinjaNinja32
5490c15274 fix vending machine message 2016-05-12 15:54:37 +01:00
PsiOmegaDelta
d8e719b435 Vending machines now clear the coin var on qdel. 
Fixes #12725.
 2016-05-12 15:54:09 +01:00
PsiOmegaDelta
825add164c Fixes vending machines not throwing their items. 
get_product() did not properly return the requested product.
 2016-05-12 15:53:28 +01:00
PsiOmegaDelta
75629504fd Vending machines now store actual object instances. 
These instances are not initialized until someone first adds or removes a product.
The last added item is the first item to be removed.
This prevents cases were you could insert half-eaten chocolate and get back a full bar, for example.
 2016-05-12 15:52:46 +01:00
Yoshax
6b6fb4a6ca Makes blue carpet and AI floor removable 2016-05-12 14:54:40 +01:00
Neerti
cb5d2db7b9 Merge pull request #1621 from Datraen/FakeNanoUI-More 
Brings New Player Manifest, Load Slot into FakeNanoUI.
 2016-05-12 00:39:44 -04:00
Datraen
16366b8e3d Brings New Player Manifest, Load Slot into FakeNanoUI. 2016-05-12 00:14:23 -04:00
Leshana
5a6232a6af Merge pull request #43 from VOREStation/species 
Various vore things
 2016-05-11 23:44:24 -04:00
Arokha Sieyes
272e0dda3d Merge pull request #45 from VOREStation/tailsnears-4 
Issue #4 - Implement custom tails, ears, and taurs.
 2016-05-11 23:40:27 -04:00
Leshana
c98d696039 Merge pull request #44 from VOREStation/morevore 
Televore
 2016-05-11 23:35:54 -04:00
Arokha Sieyes
01794ce0e2 Tweak message condition 2016-05-11 23:31:26 -04:00
Leshana
88e46b624a Issue #4 - Implement custom tails, ears, and taurs. 
- Added datums and icons for custom ears.
- Added datums and icons for custom tails.
- Added datums and icons for taurs, now a subtype of tails.
- Integrated into icon_updates() for in game appearance.
- Integrated into preferences_setup() for character setup preview.
- Added ears and tails to the character setup screen.
- Enabled nagataur support for micro/macro step-over messages.
 2016-05-11 23:25:17 -04:00
Arokha Sieyes
96f97a8c4b Adds televore, and cherrypicked a UI improvement from Polaris 2016-05-11 23:02:01 -04:00
Neerti
e2862ff083 Merge pull request #1616 from Anewbe/ai_languages 
AI Language tweaks
 2016-05-11 22:40:18 -04:00
Datraen
d7ea30c158 Changes the colors of the occupation setup tab. 2016-05-11 21:23:40 -04:00
Datraen
761ea91a70 Changes the colors of the occupation setup tab. 2016-05-11 21:14:33 -04:00
Arokha Sieyes
d705ef6d97 Merge branch 'master' into morevore 2016-05-11 21:04:22 -04:00
Arokha Sieyes
289e7e920f Eating Beacons 2016-05-11 20:54:57 -04:00
Arokha Sieyes
611c846bd0 Absorbed welder vision, bodyscanner weight and contents 2016-05-11 19:19:17 -04:00
Anewbe
ea8d63e9fd Adds Siik'Maas and Schechi to AI language list 2016-05-11 18:06:57 -05:00
Arokha Sieyes
a68d5e3c81 Examine messages for bellies and nutrition 2016-05-11 17:58:28 -04:00
Arokha Sieyes
ee0ca0dc3d The beginning of fluff doom 2016-05-11 15:53:59 -04:00
Yoshax
fa8bb179bf Fixes #1586 2016-05-11 17:17:43 +01:00
Datraen
4456f77d75 Merge pull request #1551 from Zuhayr/master 
Makes slime people more interesting and thematic.
 2016-05-11 02:34:50 -04:00
Datraen
5afebdbf27 Merge pull request #1603 from Anewbe/borg_languages 
Fixes borg languages
 2016-05-11 02:27:58 -04:00
Neerti
cb08c07cf2 Merge pull request #1602 from redstryker/master 
Adds Glowsticks
 2016-05-11 02:00:51 -04:00
Neerti
021fc36f9f Merge pull request #1587 from Anewbe/borg_armor_boost 
Borg Armor Tweak
 2016-05-11 01:58:42 -04:00
Neerti
861c9d7fdc Merge pull request #1560 from Yoshax/emagupgrade 
Adds the ability to feed telecrystals to emags for more uses
 2016-05-11 01:55:12 -04:00
Neerti
84d389a0c7 Merge pull request #1479 from Yoshax/limbfixes 
Wound Changes + Fixes + Medical Changes
 2016-05-11 01:53:58 -04:00
Datraen
e7b563ee01 Merge pull request #1593 from VOREStation/fakenano-setup 
New Player/Character Setup (Fake)NanoUI
 2016-05-11 01:53:04 -04:00