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

11060 Commits

Author SHA1 Message Date
Neerti
78e5701b5c Replaces most instances of Nyx to Vir. 2015-11-26 01:01:06 -05:00
Neerti
4da0c6b574 Removes world << output, tries to add thanksgiving on the correct date. 2015-11-25 22:19:43 -05: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
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
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
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
Neerti
4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -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
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
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
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
19051ec27e Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-11-02 09:25:04 +01:00
PsiOmegaDelta
694a35c10b Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-02 09:08:06 +01:00
Chinsky
ba3c1f03d7 Merge pull request #11195 from Hubblenaut/dev 
CtrlClick deflates inflatables
 2015-11-02 00:11:14 +03:00
Chinsky
1417f4f40b Merge pull request #11344 from Hubblenaut/tape 
Tape - Sprites and Algorithm Changes
 2015-11-02 00:10:03 +03:00
Chinsky
4ae1a45017 Merge pull request #11389 from PsiOmegaDelta/152710-MagicCrescentWindows 
Crescent windows are now near indestructible.
 2015-11-02 00:08:52 +03:00
Jon
221a4edc19 Attempts to revert and/or fix some of the changes that went into Bay Dev to alter sleepers/scanners. 
- Removes the NORTH/SOUTH sprites for the scanners, consoles, sleepers, etc. They're new, we don't use them, and I don't particularly like the look of them. We can add them back later if necessary.
- As per the new changes I've kept directional sprites as opposed to "thing-r" for right facing.
- The new body scanner sprite (white, whereas the previous is a grubby grey) has been reverted as it does not match the console.
- Sleeper console re-added, new sleeper NanoUI is still in but runs off the console not the sleeper.
- Proper directional stuff kept with the consoles, as far as I'm aware. By default the sleepers/scanners all have the consoles on the right. Light code changes will be needed to accommodate alternatives, the sprites still exist.
- Both consoles are animated and correctly disable animation with no power.
- Scanners are still entered with a verb, or clicking when grabbed, whereas sleepers are entered by click-dragging from the mob. This will probably want to be unified as I don't think this is how it used to be.
- Both consoles can be walked through, as was previously changed on Polaris.
- NO MAPPING CHANGES! The consoles work but will need to be mapped in to maps using the Polaris codebase.
 2015-10-31 22:55:17 +00:00
PsiOmegaDelta
a9f7b3a325 Merge pull request #11247 from Hubblenaut/laundry 
Adds laundry basket
 2015-10-31 11:16:14 +01:00
Neerti
865f4b1d38 Revert "Comments out clothing coverage." 2015-10-31 04:15:36 -04:00
Mark9013100
61f9608324 Comments out clothing coverage. 
Comments out the slot_is_accessible flag.
 2015-10-30 13:45:43 -04:00
Neerti
2f116e3374 Fixes a mistake involving belts not getting icons. 2015-10-29 21:56:36 -04:00
Neerti
1125961c18 Merge branch 'dev2' of https://github.com/PolarisSS13/Polaris into 10/20/2015_finish_ling 2015-10-29 21:45:01 -04:00
Neerti
92c1c468e4 Despite the name, they're not done, because reasons. 2015-10-29 21:22:42 -04:00
PsiOmegaDelta
ab2ddfcba7 Atmospheric computer circuit additions. 
Adds several missing variables used in the construction and deconstruction set of gas management computers. Fixes #11392.
Computers also no longer attemps to qdel a type on Destroy()
 2015-10-29 16:55:58 +01:00
PsiOmegaDelta
7c7ed0f3fc Crescent windows are now indestructible. 2015-10-28 09:25:12 +01:00
PsiOmegaDelta
9d6c99aaf3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	.travis.yml
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
	html/changelogs/.all_changelog.yml
 2015-10-27 13:08:33 +01:00
PsiOmegaDelta
3db2c4fb49 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
 2015-10-27 12:38:28 +01:00
Mark9013100
9b9bcff9de Brings back the Ausop helmets added in one of my earlier PRs. 
Brings back the telescopic shield sprite for the back.
And, as an act of ultimate buuuullshit, a corporate detective uniform, with a detective wardrobe(neither of them are mapped in right now).
 2015-10-26 21:02:16 -04:00
Chinsky
35ce07aa71 Merge pull request #11296 from mwerezak/pepperspray-fix 
Pepperspray and chem smoke fixes
 2015-10-26 05:42:59 +03:00
PsiOmegaDelta
e37394e8fa Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/human/human_helpers.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
 2015-10-25 20:28:48 +01:00
PsiOmegaDelta
7d4f51be8e Merge pull request #10287 from mwerezak/attack-cleanup2 
Refactors item attack click and mob melee attack handling code
 2015-10-25 08:43:47 +01:00
PsiOmegaDelta
d845a2f587 Generalizes the feed and force feed checks. 2015-10-23 10:57:55 +02:00
PsiOmegaDelta
8305404a14 Can no longer use utensils to eat if you lack the means. 
Humanoid mobs can no longer eat when missing a mouth or when their mouth is blocked when using utensils, same as when eating food directly.
Fixes  #11333.
 2015-10-22 16:52:07 +02:00
Hubblenaut
ef591fa2b3 Atmos personal locker spawn with atmos tape roll 2015-10-22 14:31:07 +02:00
Hubblenaut
8f921682a0 Police tape rewrite 2015-10-22 14:31:04 +02:00
PsiOmegaDelta
0b9b8feb1e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
 2015-10-21 10:38:57 +02:00
PsiOmegaDelta
db833735a8 Merge pull request #11340 from Baystation12/master 
Dev-freeze.
 2015-10-21 10:36:30 +02:00
Chinsky
7080020997 Merge pull request #11338 from PsiOmegaDelta/151020-TemporarilyForever 
Airlocks should no longer be temporarily electrified for the rest of the round.
 2015-10-21 01:56:32 +03:00