cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-30 07:26:39 +01:00
Code Issues Packages Projects Releases Wiki Activity
45,773 Commits 66 Branches 25 Tags
TravisFix
Commit Graph
4684 Commits
Author SHA1 Message Date
Neerti a9e7783bcb Merge pull request #511 from Woodratt/1.2.7_map_fixes2 
1.2.7 Map Fixes and sprite additions
 2015-12-10 13:50:01 -05:00
woodratt be97cbaf48 1.2.7 Map Fixes and sprite additions 
- Soda fountains added to heist base and merc base. Flamethrowers removed.
- Reduced the amount dufflebags can carry to 12 slots
- Additional shuttles added to captain's office, bridge hallway, hop office, engineering engine area, chapel, security restroom.
- Double disposal pipes and atmos pipes removed from several areas.
- Tweaked engineering restroom
- Two communicators added to the map, hotel area and civilian lockeroom.
- Groundwork added for head of staff folders added.
 2015-12-10 10:35:38 -08:00
Hubblenaut 5f28c7cfad Police tape rewrite 2015-12-10 19:25:26 +01:00
Neerti ef5c20f9b3 Merge pull request #506 from Hubblenaut/master 
Fixes Cable Merging and Floor Placing
 2015-12-10 12:45:02 -05:00
Hubblenaut 5baf93722a Fixes subcategories of floor tiles not being placable 2015-12-10 16:28:40 +01:00
PsiOmegaDeltaandGinjaNinja32 ddb5fa9248 Syndicate id card now checks if the player mind an antag. 
Instead of the player mob itself.
Fixes https://github.com/PolarisSS13/Polaris/issues/389.
 2015-12-10 10:55:55 +00:00
Zuhayr f1630108db Fixes #10915 2015-12-10 10:32:35 +10:30
HarpyEagleandHubblenaut b60146728c TTV Refactor 
Ensures TTV icon update occurs properly and removes the need for sleep() by
updating tank Destroy() to account for TTVs. Collects duplicated code into
a transfer_valve/remove_tank() proc.

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
 2015-12-08 17:54:15 +01:00
PsiOmegaDelta 5fcf13ac55 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/surgery_limbattachment.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/organs/organ.dm
	code/modules/organs/organ_external.dm
	code/setup.dm
 2015-12-08 08:09:37 +01:00
Woodratt 74d5e804d7 Merge pull request #473 from Woodratt/1.2.5_WR_Bed_DLC2 
Woodrat 1.2.5 Bed DLC
 2015-12-07 19:31:09 -08:00
woodratt 21b6a4a102 Woodrat 1.2.5 Bed DLC 
- Fixed scrubber line on the Engineering outpost
- Dropped max storage space on the dufflebag from 56 to 38
- Changed bed and bedsheet sprites.
- Removed bedsheet from the psych couch.
 2015-12-07 19:18:04 -08:00
Zuhayr c2eba995ac Merge pull request #11604 from mwerezak/organ-tag-fix 
Organ fixes
 2015-12-07 19:13:09 +10:30
PsiOmegaDeltaandNeerti 443a376848 Ghosts can now view any object with a NanoUI interface. 
However, ghosts can now also only view objects in range to ensure that the NanoUI window count is kept low.
Admins do not suffer this restriction and may also interact with these windows.
 2015-12-07 02:35:33 -05:00
HarpyEagle 93233b6dd9 Adds soap wetting log message 2015-12-06 14:03:33 -05:00
PsiOmegaDelta 6a22086c17 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/verbs/suicide.dm
	code/modules/nano/modules/crew_monitor.dm
 2015-12-06 11:34:36 +01:00
mwerezak 9135a609cb Replaces most instances of if(E & ORGAN_DESTROYED) with if(E.is_stump()). Fixes #11468 2015-12-06 04:17:52 -05:00
mwerezak 87648e86ef Fixes runtime when cleaning turfs with soap 
Partial fix of #11490
 2015-12-06 02:00:50 -05:00
mwerezak b12e094112 Removes unreachable return in organ/external/remove(), smaller embedded items are no longer deleted. Implants changed to w_class 1 because seriously a w_class 3 implant makes no sense at all. 2015-12-05 23:38:57 -05:00
Neerti c808371780 Merge pull request #444 from Neerti/12/4/2015_communicators 
Adds cellphones!
 2015-12-05 17:37:35 -05:00
Neerti 3e946447a3 Adds cellphones! Details in the changelog entry. 2015-12-05 17:26:13 -05:00
EmperorJon f6cb53835c Merge pull request #429 from EmperorJon/05_Dec._Update_main_z_level_space_areas 
Updates all get_base_turf usages to get_base_turf_by_area.
 2015-12-05 04:37:35 +00:00
Jon 85c704676f Updates all get_base_turf usages to get_base_turf_by_area. 
This means that instead of the base turf being defined by the z-level, it's now defined by area and defaulted by z-level.

Updates all "shuttle" and "solar" areas to have a base_turf of space.
Updates docking arms 1, 2, and 3 on the main asteroid level to have a base_turf of space.

Other z-levels may still need updating.

This change means that all actions which destroy or dismantle a tile - for example bombs, a singularity, a shuttle leaving, or deconstruction - now leave these new areas as space not asteroid. Future mapping efforts may need to take this into account.
 2015-12-05 04:24:17 +00:00
woodratt 1104407ffc Woodrat, Intercoms and rollerbed tweaks 
- Departmental intercoms should have
 2015-12-04 17:12:57 -08:00
Hubblenaut 470d2bb54a Fixes stack creation logic and return value 2015-12-04 15:49:31 +01:00
Zuhayr 7c85f846eb put_in_hands() refactor. 2015-12-04 17:38:58 +10:30
Earthcrusher 61c8140c01 My first contribution to Polaris! Adds a few new brands of cigarettes to vending machines. 2015-12-03 21:20:11 -06:00
Zuhayr 7801c2dc3b Minor runtime fixes. 2015-12-02 20:11:31 +10:30
PsiOmegaDelta 11e47bc8c2 Fixes being unable to emag secure closets. 
And ensures that this costs an emag charge.
Also corrects emag_act calls. Partial port of https://github.com/PolarisSS13/Polaris/pull/377.
 2015-12-02 08:30:47 +01:00
Neerti 765ac00c6c Merge pull request #367 from Neerti/12/1/2015_armor_refactor 
Refactors how armor works.
 2015-12-01 04:32:30 -05:00
Neerti 062a092cfe Refactors how armor works. It's now less of a dice roll, but still retains some randomness. This makes weaker armor worth using, and stronger armor not godlike. 
Also fixes a bug with the auto shotgun causing runtimes.
 2015-12-01 03:45:47 -05:00
Mark9013100 880ba681e6 Combination of my previous PRs, mostly fixes 2015-11-29 11:13:17 -05:00
Neerti 78e5701b5c Replaces most instances of Nyx to Vir. 2015-11-26 01:01:06 -05:00
Neerti 3ebd27eece Forgot to commit this. 2015-11-22 22:03:50 -05:00
PsiOmegaDeltaandNeerti 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
PsiOmegaDeltaandNeerti 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
PsiOmegaDeltaandNeerti 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
PsiOmegaandNeerti 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
PsiOmegaandNeerti 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
PsiOmegaandNeerti 1bd40cf8aa Makes the cyborg radio menu more consistent. 2015-11-22 21:36:18 -05:00
PsiOmegaandNeerti 42342bedcb Rotates and otherwise cleans up map intercom usage. 
Conflicts:
	code/controllers/communications.dm
 2015-11-22 21:35:36 -05:00
PsiOmegaandNeerti 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
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 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 1417f4f40b Merge pull request #11344 from Hubblenaut/tape 
Tape - Sprites and Algorithm Changes
 2015-11-02 00:10:03 +03:00
PsiOmegaDelta a9f7b3a325 Merge pull request #11247 from Hubblenaut/laundry 
Adds laundry basket
 2015-10-31 11:16:14 +01: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 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