cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,362 Commits 8 Branches 0 Tags
36755f077c94bbdd4db12836ea8c901b39daae86
Commit Graph

21229 Commits

Author SHA1 Message Date
Jon
36755f077c Removes the Resomi clothing from the custom loadout to prevent confusion as we're not intending to have Resomi crew, to my knowledge. 2015-11-27 16:58:48 +00:00
Neerti
61da41533a Merge branch 'master' into 11/26/2015_most_ideal_splash_screen 2015-11-26 11:34:06 -05:00
Neerti
dd05d385c5 Adds Mockingjay00's title screen. 
Adds a system to randomly pick a title screen for the round.
 2015-11-26 11:33:16 -05:00
Neerti
dc170af54e Update locations.dm 
Gets rid of debug verbs.
 2015-11-26 11:07:04 -05:00
Neerti
87c54986da Adds the groundwork to define many, many places in the lore in-game. This could have several applications and help bring the fluff in-game. 
Places added:
Sol, needs lots of love.
Tau Ceti, needs more love.
Tajara, Skrell, and Unathi home systems.  Taj needs to be finished.
Nyx, and Vir.
 2015-11-26 10:41:19 -05:00
Neerti
78e5701b5c Replaces most instances of Nyx to Vir. 2015-11-26 01:01:06 -05:00
Neerti
39c741f204 Merge branch 'master' into 11/25/2015_thanksgiving_fix 2015-11-25 22:24:33 -05:00
Neerti
4da0c6b574 Removes world << output, tries to add thanksgiving on the correct date. 2015-11-25 22:19:43 -05:00
Jon
782ae235e9 Changes the lobby screen's image name from "Baystation12" to "Polaris". 2015-11-24 20:19:38 +00:00
Neerti
31e3bd29cc Refactors holiday system slightly. It's now a list based system, so you can have multiple holidays on the same day, in case you wanted to do that. 
Removes the dumb Holidays.
Adds more real life and fictional holidays, and adds a blurb for all of them.
 2015-11-23 09:28:34 -05:00
Neerti
3ebd27eece Forgot to commit this. 2015-11-22 22:03:50 -05:00
PsiOmegaDelta
d709363ff7 Radio NanoUI. 
Ports the radio NanoUI interface from Paradise with some Bay-adjustments.
Based on the latest revision https://github.com/ParadiseSS13/Paradise/pull/2369.
 2015-11-22 21:42:54 -05:00
PsiOmegaDelta
3eae0d5101 Destroy tweaks. 
Ports Destroy() proc tweaks from Paradise and /tg/, sourced from https://github.com/ParadiseSS13/Paradise/pull/2091.
Adds returns in Destroy()s, to prepare for future return values.
 2015-11-22 21:42:27 -05:00
PsiOmegaDelta
2200bfe436 Map tweaks. 
Adds a couple of decals to the Thunderdome.
Rotates sleepers/scanners on z-level 1 and 2. Had already done so for z-level 5. Fixes #11058.
Full tile windows no longer appear to exist? Replaces the glass on the toxin test site with reinforced glass spawners.
 2015-11-22 21:41:41 -05:00
PsiOmega
5047ea8267 Observers can now view radio settings, admins can alter them. 
Conflicts:
	code/game/objects/items/devices/radio/headset.dm
 2015-11-22 21:40:59 -05:00
PsiOmega
5bf7158c9d Non-headset/borg radios now all allow access to department channels. Headset and borg radios still rely on their encryption keys. 
Conflicts:
	html/changelogs/PsiOmegaDelta-Radio.yml
 2015-11-22 21:37:21 -05:00
PsiOmega
1bd40cf8aa Makes the cyborg radio menu more consistent. 2015-11-22 21:36:18 -05:00
PsiOmega
42342bedcb Rotates and otherwise cleans up map intercom usage. 
Conflicts:
	code/controllers/communications.dm
 2015-11-22 21:35:36 -05:00
PsiOmega
92afc566bb Makes it possible to select department channels on intercoms. 
Conflicts:
	code/game/objects/items/devices/radio/intercom.dm
	code/game/objects/items/devices/radio/radio.dm
 2015-11-22 21:34:13 -05:00
EmperorJon
fc1e9a9281 Merge branch 'master' into 22_Nov._Reduce_loadout_points 2015-11-22 21:18:43 +00:00
Jon
31702c626d Comments out the Geneticist job so that it doesn't appear in the preferences. Given that it doesn't work in any way, has 0 slots, and nobody's overhauling it any time soon (probably), I don't see the point in having it available in the preferences screen - that's just confusing. 2015-11-22 11:26:15 +00:00
Jon
331e12b304 Reduces the loadout points from 15 to 10. We can see where we go from there, but I think we all agree that 15 was just a large number chosen for testing and is probably a little ridiculous, but we want higher than 5 - hence 10. 2015-11-22 11:02:59 +00:00
Neerti
b635a64530 Fixes socks. Again. For the third time. 2015-11-20 08:50:30 -05:00
PsiOmegaDelta
df0188662c Character setup tweaks. 
Adds client verb to access the character setup screen from anywhere.
Moves name validation to species level, making it possible for IPCs to have numbers in their name.
Adds gender validation, also adds support to add neuter/plural genders in the future if ever desired.
Now sanitizes preferences before applying them to a mob.
Fixes #11433.

(cherry picked from commit e40246e9dfc9feb28b8c5a0a7ce765fd063c4f7e)
 2015-11-20 07:50:12 -05:00
PsiOmegaDelta
e715c16093 Character setup refactoring. 
Begins breaking down the large character setup in more manageable modules, allowing for easier additions, edits, and removals.

(cherry picked from commit e116721977)

Conflicts:
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	polaris.dme
 2015-11-20 07:46:31 -05:00
Neerti
38833c18c4 Adds check if something in hand would have access before returning it. 2015-11-19 08:40:41 -05:00
Neerti
70ade2ed59 Fixes access checks ignoring the ID in your hand if already wearing an ID. 2015-11-19 08:00:07 -05:00
Neerti
4e712b5a73 Merge branch 'master' into 11/19/2015_gun_modes 2015-11-19 07:36:09 -05:00
Neerti
05ec2e7c28 Fixes gun mode switching. 2015-11-19 07:27:34 -05:00
Neerti
9473b7567e Fixes antags spawning in space. 2015-11-19 04:49:35 -05:00
Neerti
dd3ab4dac0 Finishes new ling, need better sprites but that's for another time. 2015-11-18 16:20:28 -05:00
SinTwo
c88689662c Merge pull request #1 from PolarisSS13/master 
Update
 2015-11-08 18:51:43 -05:00
SinTwo
8c816a9f28 Helmets 2015-11-08 18:10:34 -05:00
SinTwo
05377d0f5d Hoods 2015-11-08 18:10:19 -05:00
Neerti
4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
Neerti
f3c1be4241 Fixes socks and preview icon. 2015-11-06 23:20:50 -05:00
Neerti
45f15930a0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge 
Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme
 2015-11-06 17:41:18 -05:00
mwerezak
db59f87cb0 Merge pull request #11424 from PsiOmegaDelta/151106-RuntimeFlashing 
Fixes  #11422.
 2015-11-06 13:10:24 -05:00
PsiOmegaDelta
b1fe5e3eab Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/antagonist/outsider/ert.dm
 2015-11-06 17:50:34 +01:00
PsiOmegaDelta
e81f42840a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/species/station/station.dm
 2015-11-06 17:43:05 +01:00
PsiOmegaDelta
31536c6a56 Fixes #11422. 
There is nothing to see here...
 2015-11-06 11:13:31 +01:00
Datraen
a1757ee696 Removes acetone and hydrazine from the chem list. 2015-11-05 19:41:04 -05:00
Datraen
6660b6f61c Tweaks plants to create a more diverse selection, different environment constants. 2015-11-05 18:43:05 -05:00
Chinsky
bef8d99703 Merge pull request #11409 from PsiOmegaDelta/151104-DionaLanguage 
When a diona splits, the main nymph inherits all known languages.
 2015-11-06 00:37:48 +03:00
PsiOmegaDelta
73f99a4c01 Secondary diona nymphs now get non-restricted/whitelisted languages on split. 2015-11-05 10:04:00 +01:00
PsiOmegaDelta
20eb505c69 Adds antag datum flag that is used to exlude the type from random selection. 
Death Commando, Mercenary Commando (inherits from death commando), and the ERT antag types added to the exclude list. Fixes  #11416.
 2015-11-05 08:48:05 +01:00
PsiOmegaDelta
5f4af85af9 Refactors diona split code for maximum reuse. 2015-11-05 08:15:10 +01:00
PsiOmegaDelta
daa9b0e0bc When a diona splits, the main nymph inherits all known languages. 
Fixes #11401.
 2015-11-04 17:50:51 +01:00
Woodrat
0929cb4cc2 Woodrat v9.6 "Open Beta" 
- Minor tweaks to sleepers so they can can be set in different directions
- Sleepers and body scanners added to all maps
 2015-11-03 14:30:56 -08:00
PsiOmegaDelta
1648e46dcf Merge pull request #11408 from Baystation12/dev-freeze 
Dev
 2015-11-03 17:50:53 +01:00