cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 22:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,579 Commits 7 Branches 0 Tags
3014a8ce7151368b213f42c65d0b67a33cab0f70
Commit Graph

14010 Commits

Author SHA1 Message Date
Arokha Sieyes
3014a8ce71 Merge pull request #80 from VOREStation/suit_tweak 
Fixes suit rendering
 2016-05-16 09:33:18 -04:00
Arokha Sieyes
c70cc6d03f Merge pull request #79 from VOREStation/gateway 
Issue #23 - Fixed the Gateway
 2016-05-16 09:33:06 -04:00
Arokha Sieyes
fdd80f4df9 Update update_icons.dm 2016-05-16 01:16:38 -04:00
Arokha Sieyes
ee52e8d9fe Fixes suit rendering 2016-05-16 01:14:35 -04:00
Leshana
2cd88ab4ca Issue #23 - Fixed the Gateway 
* Ported gateway compatibilty with runtime z-level loading from old codebase.
* Built a new Gateway room next to EVA on the map.
* Fixed the beach level to not crash.
 2016-05-16 00:00:51 -04:00
Arokha Sieyes
22802d40e6 Tweaks fluff items more, fixes a few visual/icon bugs 2016-05-15 23:30:36 -04:00
JoanRisu
091e175dd4 Fluff Items 3: The sequel to the sequel 
Mark as Done:
//scree:Scree
/obj/item/clothing/head/fluff/pompom

//zodiacshadow: ?
/obj/item/device/radio/headset/fluff/zodiacshadow

// OrbisA: Richard D'angelo
/obj/item/weapon/melee/fluff/holochain

//eekasqueak: Serkii Miishy
/obj/item/fluff/permit/serkiimiishy

// bwoincognito:Tasald Corlethian
/obj/item/clothing/suit/storage/det_suit/fluff/tasald

// bwoincognito:Tasald Corlethian
/obj/item/clothing/suit/storage/det_suit/fluff/tas_coat

// joey4298:Emoticon
/obj/item/device/fluff/id_kit_mime

//General Use
/obj/item/weapon/flag

// bwoincognito:Tasald Corlethian
/obj/item/weapon/storage/box/fluff/tasald
name = "Tasald's Kit"

// jemli:Cirra Mayhem
/obj/item/weapon/storage/box/fluff/cirra

// joey4298:Emoticon
/obj/item/weapon/storage/box/fluff/emoticon

// joanrisu:Joan Risu
/obj/item/weapon/storage/box/fluff/joanrisu
 2016-05-15 19:00:56 -07:00
Cameron653
c6688f5051 Actualy fixes things. WIP 2016-05-15 14:59:14 -04:00
Cameron653
e764a6fff0 Merge remote-tracking branch 'refs/remotes/VOREStation/master' 2016-05-15 14:50:19 -04:00
Cameron653
1bb1e41c5a Makes species actually have spacesuit sprites. WIP 
WIP. DNM
 2016-05-15 13:31:37 -04:00
Arokha Sieyes
9636bc0bd6 Merge pull request #65 from VOREStation/improper 
Fix the letter ÿ in nano-ui displays
 2016-05-15 13:12:34 -04:00
Arokha Sieyes
f8fe9994e5 Merge branch 'master' of https://github.com/VOREStation/Polaris into polaris-update 
# Conflicts:
#	code/world.dm
#	config/example/config.txt

Resolved by removing old lines.
 2016-05-15 12:39:30 -04:00
Leshana
2be7b323a5 Fix the letter ÿ in nano-ui displays 
* Particularly noticable on the cartridge button of the PDA, any time we transmit a name containing \improper or \proper using nanoui it shows up as ÿ
* This is becuase BYOND internally handles these escapes by simply using character 0xFF etc.
* We'd better strip them out before sending them as JSON data so they aren't rendered as ÿ when treated as utf-8 encoding.
 2016-05-14 23:24:08 -04:00
Leshana
8bec946868 Merge pull request #61 from VOREStation/newjobs 
Adds Clown, Mime, CC jobs
 2016-05-14 23:03:28 -04:00
Leshana
24149e7c01 Merge pull request #64 from VOREStation/stopscoops 
Prevents scooping everyone
 2016-05-14 22:56:37 -04:00
Leshana
cce7ff0ca7 Merge pull request #63 from VOREStation/speciesspawn 
Makes species spawnable
 2016-05-14 22:52:16 -04:00
Leshana
bfce32a6d7 Merge pull request #62 from VOREStation/fixupstation 
Fix station species to inherit hot/cold tolerances from humans
 2016-05-14 22:49:18 -04:00
Arokha Sieyes
ddc37a1b82 Prevents scooping everyone 
Only small species can be dragscooped
 2016-05-14 22:45:23 -04:00
Arokha Sieyes
61557e6611 Makes Virgo custom species admin-spawnable 2016-05-14 22:23:52 -04:00
Arokha Sieyes
b64cfa3f8a Makes Teshari admin-spawnable like all other species 
Just adds them to the same list as all other species, so they can be spawned by admins for events or to replace bodies for players or whatever.
 2016-05-14 22:23:31 -04:00
Arokha Sieyes
b34154c653 Fix station species to inherit hot/cold tolerances from humans. So annoying. 2016-05-14 20:23:30 -04:00
Arokha Sieyes
88dd4973c8 Hid latejoin_only jobs from occupations screen 2016-05-14 20:15:27 -04:00
Arokha Sieyes
ece408d5a8 Merge pull request #58 from JoanRisu/master 
Fluff Items 2: Resurgance
 2016-05-14 19:46:47 -04:00
JoanRisu
f11ed9f8f4 hotfix 2016-05-14 16:28:25 -07:00
Arokha Sieyes
9da2307e3f Fixes Loyalty Implants 
Why would you define a proc on /mob/living/carbon/human for implanting something then ask to be passed your own src? Also why would you try to pass /job/datums as something to implant? Silly.
 2016-05-14 18:08:35 -04:00
Arokha Sieyes
1c77dda552 Adds centcom jobs, headset, PDA, as-of-yet unused hud_vr soon-to-be-used 2016-05-14 18:02:36 -04:00
Arokha Sieyes
ad24bfcfdf Merge pull request #57 from VOREStation/jobwhitelist 
Adds job whitelist
 2016-05-14 14:10:01 -04:00
Arokha Sieyes
8319c8b1b1 More color macro removal 2016-05-14 13:52:40 -04:00
Arokha Sieyes
231ee5bf35 Work on satisfying travis 2016-05-14 13:38:24 -04:00
Arokha Sieyes
cecfc8f142 Merge pull request #54 from VOREStation/custom-race-11 
Working on Issue #11 - Added custom race option
 2016-05-14 12:39:18 -04:00
JoanRisu
44d6771a4c The Next Batch: Cont 
Github fucking unchecked this file for commit. >:c
 2016-05-14 02:33:23 -07:00
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
Arokha Sieyes
553ab65bf1 Adds job whitelist 2016-05-13 22:01:52 -04:00
Leshana
53a58d7c43 Working on Issue #11 - Added custom race option 
* Added to character setup screen.
* Added to examine text.
 2016-05-13 20:07:39 -04:00
Neerti
76058c701c Merge pull request #1629 from Datraen/SkrellGotHeadtail 
Adds more Skrell Headtail choices, loadout tweaks
 2016-05-13 00:32:01 -04:00
Datraen
da31267600 Merge pull request #1633 from Yoshax/dionarights 
Gives Diona pay the same as Taj and Unathi
 2016-05-12 23:12:58 -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
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
Datraen
73ee2e5ef0 Merge pull request #1637 from Yoshax/ignorefix 
Fixes ignored preferences not being saved between rounds
 2016-05-12 22:03:15 -04:00
Datraen
baa7840bf2 Merge pull request #1641 from Yoshax/woundfix 
Fixes not being able to stop wounds from bleeding
 2016-05-12 22:03:02 -04:00
Datraen
19c89532d2 Merge pull request #1627 from Yoshax/lights 
Lights changes and additions
 2016-05-12 21:58:52 -04:00
Arokha Sieyes
04ef9305ff Finishing up custom_guns.dm port 2016-05-12 21:57:40 -04:00
Datraen
32f35bcc88 Merge pull request #1638 from Anewbe/unathi_chem_changes 
Unathi Chem Changes - Sledge Approved
 2016-05-12 21:57:27 -04:00
Yoshax
24f7c0ca2c Fixes not being able to stop wounds from bleeding 2016-05-13 02:51:40 +01: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