mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-01-24 16:32:03 +00:00
commit722cf3d3f8Merge:40e63cbc788e9dAuthor: Chinsky <krauchinsky@gmail.com> Date: Tue May 28 23:58:37 2013 -0700 Merge pull request #2894 from MagmaRam/master Minor sprite fixes commitc788e9d323Author: MagmaRam <drpepper42yes@gmail.com> Date: Wed May 29 13:42:03 2013 +0700 Fix for crew monitoring consoles turning spriteless when destroyed. commite4c913fad9Author: MagmaRam <drpepper42yes@gmail.com> Date: Wed May 29 13:34:54 2013 +0700 Fix for issue #2882 in Baystation12/master (CR-20 not updating sprite correctly when unloaded by in-hand click). commit40e63cbe32Merge:1f039e962e43f2Author: Chinsky <krauchinsky@gmail.com> Date: Tue May 28 22:17:13 2013 -0700 Merge pull request #2885 from Ravensdale/master Cyborg sprites commit1f039e96bbMerge:b80ae6801ef589Author: Chinsky <krauchinsky@gmail.com> Date: Tue May 28 22:16:50 2013 -0700 Merge pull request #2888 from Erthilo/master Fixes everyone being able to understand everyone else. commit01ef589293Author: Erthilo <erthilo+git@gmail.com> Date: Tue May 28 23:53:49 2013 +0100 Fixes everyone being able to understand everyone else. commit62e43f2abfAuthor: Ravensdale <Tri@rdinn.com> Date: Tue May 28 12:07:22 2013 -0700 re-adding an accidentally deleted line commitb80ae68cc5Merge:d2179f4a9d4d86Author: Jim "Apples" <cheeckan@gmail.com> Date: Tue May 28 11:49:25 2013 -0700 Merge pull request #2883 from CIB/master Re-buff even timer commitb42aa26c1aAuthor: Ravensdale <Tri@rdinn.com> Date: Tue May 28 11:13:33 2013 -0700 Gives more sprites for cyborgs to use. commita9d4d86ed9Author: cib <cib123@googlemail.com> Date: Tue May 28 20:03:26 2013 +0200 Event balance fixes. - Engineering events now less likely - Radiation storm now less likely - Halved radiation given by radiation storm. commitd2179f4252Merge:faef29fc5dc8ebAuthor: Chinsky <krauchinsky@gmail.com> Date: Mon May 27 12:04:19 2013 -0700 Merge pull request #2875 from CIB/medical_events Fixed issue #2689 commitfaef29fe41Merge:b4743bed9a88f2Author: Chinsky <krauchinsky@gmail.com> Date: Mon May 27 11:14:40 2013 -0700 Merge pull request #2873 from fauxki/master Map Fix commitc5dc8ebecfAuthor: cib <cib123@googlemail.com> Date: Mon May 27 20:01:37 2013 +0200 Triped time you have to get into maintenance. Also re-added sound at start of event. It doesn't fit, but it's better than nothing. Quit complaining already. commitd9a88f236aAuthor: fauxtada <alcoholfox@gmail.com> Date: Mon May 27 09:58:03 2013 -0700 Fixes airless tiles under airlocks issue that was messing with zas. commit6eee010a34Merge:bef1de0b4743beAuthor: fauxtada <alcoholfox@gmail.com> Date: Mon May 27 08:43:50 2013 -0700 Merge branch 'master' of https://github.com/Baystation12/Baystation12 commitb4743bef26Merge:e760114cbbe291Author: Mloc <colmohici@gmail.com> Date: Sun May 26 14:56:53 2013 -0700 Merge pull request #2865 from CIB/medical_events Fixed various medical events. commitcbbe291a5dAuthor: cib <cib123@googlemail.com> Date: Sun May 26 23:21:08 2013 +0200 Fixed various medical events. commitdbe960a571Author: cib <cib123@googlemail.com> Date: Sun May 26 22:16:11 2013 +0200 Buffed event delay a bit again. commitcab1289511Merge:90746220834944Author: cib <cib123@googlemail.com> Date: Sun May 26 20:43:22 2013 +0200 Merge branch 'master' of github.com:Baystation12/Baystation12 Conflicts: html/changelog.html commite7601146a9Merge:0834944420354dAuthor: Mloc <colmohici@gmail.com> Date: Sun May 26 11:41:10 2013 -0700 Merge pull request #2862 from Baystation12/bleeding-edge-freeze BEF merge commit420354d1dcMerge:81c737ccab1289Author: Mloc <colmohici@gmail.com> Date: Sun May 26 11:40:42 2013 -0700 Merge pull request #2860 from CIB/master Fix to event no-repetition code commit81c737c5a4Merge:b46924530a39d5Author: Chinsky <krauchinsky@gmail.com> Date: Sun May 26 11:29:39 2013 -0700 Merge pull request #2863 from meyar/master Derp commit30a39d580fAuthor: meyar <grimreaper219@hotmail.com> Date: Sun May 26 14:26:00 2013 -0400 Forgot about airlock access commitb46924556bMerge:796c800f6f263eAuthor: Chinsky <krauchinsky@gmail.com> Date: Sun May 26 11:21:26 2013 -0700 Merge pull request #2861 from fauxki/bleeding-edge-freeze Wall Recharger Fix - bef commit796c800b54Merge:76525a461b7aa0Author: Chinsky <krauchinsky@gmail.com> Date: Sun May 26 11:14:39 2013 -0700 Merge pull request #2858 from meyar/master Meyars changelog commit61b7aa06aeAuthor: meyar <grimreaper219@hotmail.com> Date: Sun May 26 12:14:18 2013 -0400 Remembered to actually add to the changelog commit76525a4ccfMerge:7971342827e85cAuthor: Chinsky <krauchinsky@gmail.com> Date: Sat May 25 16:03:24 2013 -0700 Merge pull request #2852 from VitrescentTortoise/bleeding-edge-freeze Changeling husk names now 'Unknown' commit827e85c4c3Author: VitrescentTortoise <max.blackllama@gmail.com> Date: Sat May 25 16:00:22 2013 -0700 Properly sets husks' names to unknown commit9074622eb9Author: cib <cib123@googlemail.com> Date: Sun May 26 00:23:31 2013 +0200 Adjusted event chance modifier based on last event. Had the wrong numbers, basically every event would happen only once. commita764c226f8Author: cib <cib123@googlemail.com> Date: Sun May 26 00:12:59 2013 +0200 Implemented a system to avoid the same event happening too often. Also bumped event frequency, this shouldn't be as bad with the same event not repeating itself that often. commit7971342d3fMerge:cc020eba764c22Author: Chinsky <krauchinsky@gmail.com> Date: Sat May 25 15:11:56 2013 -0700 Merge pull request #2854 from CIB/master Implemented a system to avoid the same event happening too often. commit0834944030Merge:d8ed2d2e2ea94dAuthor: Chinsky <krauchinsky@gmail.com> Date: Sat May 25 14:45:37 2013 -0700 Merge pull request #2853 from Erthilo/master Mutant Races, UI Genetics fixes commitcc020ebebaMerge:858d98eafb49c0Author: Chinsky <krauchinsky@gmail.com> Date: Sat May 25 14:21:47 2013 -0700 Merge pull request #2851 from VitrescentTortoise/bleeding-edge-freeze Fixed lemonjuice showing up as ..what? commitc451287aa8Author: VitrescentTortoise <max.blackllama@gmail.com> Date: Sat May 25 14:17:16 2013 -0700 The name of changeling husks is now unknown commite2ea94d59cMerge:77c5123d8ed2d2Author: Erthilo <erthilo+git@gmail.com> Date: Sat May 25 22:16:29 2013 +0100 Merge branch 'master' of https://github.com/Baystation12/Baystation12 commit77c51235afAuthor: Erthilo <erthilo+git@gmail.com> Date: Sat May 25 22:15:42 2013 +0100 Changelog updated and archived. commit0e3bf2f371Author: Erthilo <erthilo+git@gmail.com> Date: Sat May 25 22:10:14 2013 +0100 Fixes UI being reset randomly on irradiating in Genetic Scanners. commit4028172c98Author: Erthilo <erthilo+git@gmail.com> Date: Sat May 25 22:09:41 2013 +0100 Fixes mutantrace languages appearing as unknown for observers and also appearing as says rather than race specific word. commitc2b84e0985Author: Erthilo <erthilo+git@gmail.com> Date: Sat May 25 22:08:57 2013 +0100 Fixes mutantraces (soghun, skrell, tajaran) losing languages when cloned. commitafb49c05d9Author: VitrescentTortoise <max.blackllama@gmail.com> Date: Sat May 25 12:52:56 2013 -0700 Fixed lemonjuice showing up as ..what? commitf6f263ebcdAuthor: fauxtada <alcoholfox@gmail.com> Date: Sat May 25 09:32:25 2013 -0700 Wall Recharger Fix - Oopsie. Sprites should work now when recharger is charging. commitd8ed2d2b29Merge:4f293e5e197799Author: Jim "Apples" <cheeckan@gmail.com> Date: Sat May 25 06:12:16 2013 -0700 Merge pull request #2850 from comma/master Couple of fixes commite197799c46Author: Chinsky <krauchinsky@gmail.com> Date: Sat May 25 13:34:24 2013 +0400 Fixes #2830 Applied Walter0o's fix to silicon namepicking locking up job spawn on roundstart. commitb78cb81a38Author: Chinsky <krauchinsky@gmail.com> Date: Sat May 25 13:18:12 2013 +0400 Fixes #2849 Applied Walter0o's fix to job controller changing whole job's access when single ID was modified. commit858d98eb7cMerge:5eb23b91486e4bAuthor: Jim "Apples" <cheeckan@gmail.com> Date: Fri May 24 14:30:36 2013 -0700 Merge pull request #2816 from comma/HTML HTML in papers commit5eb23b9ceeMerge:0a15485e0f4b0dAuthor: Chinsky <krauchinsky@gmail.com> Date: Fri May 24 14:28:30 2013 -0700 Merge pull request #2848 from Asanadas/bleeding-edge-freeze Bugfix: Prevents airlock_controller.dm and similar from being destroyed ... commite0f4b0d1edAuthor: Asanadas <asanadas@hotmail.com> Date: Fri May 24 14:55:28 2013 -0400 Bugfix: Prevents airlock_controller.dm and similar from being destroyed by mech drills or acid. Prevents headaches. commit0a15485377Merge:f9a81bc1ac5ac6Author: Chinsky <krauchinsky@gmail.com> Date: Fri May 24 05:07:06 2013 -0700 Merge pull request #2847 from meyar/master Git hates me commit1ac5ac6ec5Merge:3e6261ef9a81bcAuthor: meyar <grimreaper219@hotmail.com> Date: Fri May 24 07:55:24 2013 -0400 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 commitf9a81bc57cMerge:33f8309cb5b83fAuthor: Chinsky <krauchinsky@gmail.com> Date: Fri May 24 04:54:32 2013 -0700 Merge pull request #2845 from fauxki/bleeding-edge-freeze BEF - Wall Charger / Map Changes commit3e6261ea04Author: meyar <grimreaper219@hotmail.com> Date: Fri May 24 07:38:00 2013 -0400 Once more with feeling commit1d5d7cb901Merge:fe077a133f8309Author: meyar <grimreaper219@hotmail.com> Date: Fri May 24 06:52:03 2013 -0400 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 commitfe077a1f08Author: meyar <grimreaper219@hotmail.com> Date: Fri May 24 06:08:34 2013 -0400 Fixes the nuke shuttle (Again. Goddamnit) Fixes the Bar sign (Request by apple master) Fixes the research hazard doors having blind spots. commitc1e701f32bMerge:f09803c1da1592Author: meyar <grimreaper219@hotmail.com> Date: Fri May 24 05:23:36 2013 -0400 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 Conflicts: maps/tgstation.2.1.0.0.1.dmm commitcb5b83fadbAuthor: fauxtada <alcoholfox@gmail.com> Date: Thu May 23 17:46:31 2013 -0700 Wall Charger Addition / Map Edits - Puts in wall recharger sprite. For all your wall recharging needs. - Reverts changes someone did moving my wall temp placement wall rechargers.. - Fixes airlocks over doors issue in sec. - Also removed the access medical from the medical area of security. It's just a quick area to treat cuts and bruises, and shouldn't have items that treat more then that. - Fixed some more weirdly placed rechargers around the station. - Replaced the TG Maltese Falcon sign with the BS12 one. - Fixed up the floor in the pool area. - Added some lights and decorative items to that weird tator / table area south of the security pod. As well as a water tank and fuel tank. commitbd8a2f7d71Merge:cbaeb8a33f8309Author: fauxtada <alcoholfox@gmail.com> Date: Thu May 23 16:21:28 2013 -0700 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze Conflicts: maps/tgstation.2.1.0.0.1.dmm commit33f8309c5bMerge:62e5253e9fc666Author: Asanadas <asanadas@hotmail.com> Date: Thu May 23 15:13:19 2013 -0700 Merge pull request #2844 from CIB/master Removing hijack means less bloodshed, plus we already admin change it whenever it pops up. commite9fc666cdbAuthor: cib <cib123@googlemail.com> Date: Fri May 24 00:12:29 2013 +0200 Removed hijack from wizard. commit0bfb43b864Author: cib <cib123@googlemail.com> Date: Fri May 24 00:09:47 2013 +0200 Removed hijack objective. AGAIN. commit62e525329bMerge:3c1227789aa936Author: Chinsky <krauchinsky@gmail.com> Date: Thu May 23 13:48:33 2013 -0700 Merge pull request #2842 from CIB/master Rev fixes commit4f293e5000Merge:5c26b1eef2c7afAuthor: Chinsky <krauchinsky@gmail.com> Date: Thu May 23 13:46:47 2013 -0700 Merge pull request #2843 from Kilakk/master Telescopic baton extend/collapse message fix commit89aa936147Author: cib <cib123@googlemail.com> Date: Thu May 23 22:46:27 2013 +0200 Fix to organ_failure event. commitef2c7af6a0Author: Kilakk <kilakkindustries@gmail.com> Date: Thu May 23 16:24:53 2013 -0400 Telescopic baton message fix. Fixed first- and third- person extend/collapse messages for the telescopic baton, woo commitb5217d862aAuthor: cib <cib123@googlemail.com> Date: Thu May 23 22:12:20 2013 +0200 A few fixes to rp-rev - Name was empty, hopefully using real_name fixes that - Announcements coming too quickly - Fixed icon path issue commitc4b8ef6e59Author: cib <cib123@googlemail.com> Date: Thu May 23 20:27:13 2013 +0200 You can't close emagged doors anymore, but you can still remove circuitry. commit3c1227741dMerge:b0654c1c4b8ef6Author: Chinsky <krauchinsky@gmail.com> Date: Thu May 23 11:24:09 2013 -0700 Merge pull request #2839 from CIB/master Fixes to airlock fixing stuff commitb1b448e0eeAuthor: cib <cib123@googlemail.com> Date: Thu May 23 20:15:45 2013 +0200 Adjusted event announcement delays. Also improved some radiation belt announcements. commitce19719700Author: cib <cib123@googlemail.com> Date: Thu May 23 19:47:33 2013 +0200 Fixed two problem with airlock/APC commit: - Debugger now sends messages to user instead of usr(whoops) - Can now close emagged door with crowbar so you can take out circuit - Couldn't weld emagged doors - Replacing the circuitry should now be sufficient to fix an emagged door. commit5c26b1ea79Merge:91bea95629022fAuthor: Mloc <colmohici@gmail.com> Date: Thu May 23 09:11:05 2013 -0700 Merge pull request #2837 from comma/master Fix for LSD zombies. commit2bfc48e097Author: cib <cib123@googlemail.com> Date: Thu May 23 17:06:11 2013 +0200 Fixed .dme Seriously.. commitb0654c1d55Merge:8b60bab2bfc48eAuthor: Chinsky <krauchinsky@gmail.com> Date: Thu May 23 08:04:34 2013 -0700 Merge pull request #2838 from CIB/master APC and airlock stuff commitaa6bfc33c7Author: cib <cib123@googlemail.com> Date: Thu May 23 16:43:29 2013 +0200 Airlock and APC changes. - Added a debugger device that can figure out when an object has been hacked/emagged - Hacked APCs no longer display blue screen - You can now disassemble emagged airlocks, they will yield a fried airlock electronic. commit629022f7b0Author: Chinsky <krauchinsky@gmail.com> Date: Thu May 23 15:06:37 2013 +0400 Fixes #2836 Winners do not use space drugs. Fixes LSD giving you an ability to escape death once. Whilst hilarious, this can be breaking things that depend on mob staying dead after calling death(). My guess is that at some point halloss was counted in UpdateHeath(), but it is not anymore, so people don't die from combination of halloss and other damages being over 200. commit8b60bab4a7Merge:996c967cb59473Author: Chinsky <krauchinsky@gmail.com> Date: Thu May 23 01:55:45 2013 -0700 Merge pull request #2835 from Roaper/master No tears, only dreams commitbef1de05cbMerge:91bea95996c967Author: fauxtada <alcoholfox@gmail.com> Date: Wed May 22 14:14:11 2013 -0700 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 commitcb59473d02Author: Roaper <roaperable@gmail.com> Date: Wed May 22 13:36:27 2013 -0700 Added more dreams to Dreaming.dm Signed-off-by: Roaper <roaperable@gmail.com> commit91bea952bbMerge:93352aeb22d43dAuthor: Mloc <colmohici@gmail.com> Date: Wed May 22 11:30:03 2013 -0700 Merge pull request #2831 from comma/master I did something. commit996c967429Merge:80b8a5e6ef40eeAuthor: Mloc <colmohici@gmail.com> Date: Wed May 22 11:29:43 2013 -0700 Merge pull request #2832 from comma/bleeding-edge-freeze Bleeding edge freeze commit6ef40ee7a7Merge:495fd9480b8a5eAuthor: Chinsky <krauchinsky@gmail.com> Date: Wed May 22 21:35:50 2013 +0400 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze Conflicts: maps/tgstation.2.1.0.0.1.dmm commit495fd944ffMerge:317cbd8b22d43dAuthor: Chinsky <krauchinsky@gmail.com> Date: Wed May 22 18:34:08 2013 +0400 Merge branch 'master' into bleeding-edge-freeze Conflicts: maps/tgstation.2.1.0.0.1.dmm commitb22d43dfa1Author: Chinsky <krauchinsky@gmail.com> Date: Wed May 22 17:27:54 2013 +0400 Reapplies reverted changes. Which are: fixed psych pipes linking distro, fixed pipes and wires and disposals in sec, added missing cameras to sec/research dock, fixed the bridge charger, moved the ugly wallchargers in sec, added a valve for the permabrig nitrus commit317cbd8438Merge:bdb16b1da99e06Author: Chinsky <krauchinsky@gmail.com> Date: Wed May 22 16:51:41 2013 +0400 Merge branch 'master' into bleeding-edge-freeze Conflicts: baystation12.dme commitda99e06c8eAuthor: Chinsky <krauchinsky@gmail.com> Date: Wed May 22 16:49:25 2013 +0400 Untracked accidentally committed file. what the hell is this file doing in repo... commit548f6760cfMerge:1ca42d093352aeAuthor: Chinsky <krauchinsky@gmail.com> Date: Wed May 22 16:37:40 2013 +0400 Merge branch 'master' of https://github.com/Baystation12/Baystation12 commitbdb16b1f99Author: Chinsky <krauchinsky@gmail.com> Date: Wed May 22 14:05:53 2013 +0400 Renamed bruise pack back to gauze. STAY LIKE THAT. commit80b8a5e70fMerge:17e31e893352aeAuthor: Mloc <colmohici@gmail.com> Date: Wed May 22 10:53:29 2013 +0100 Merge master. Signed-off-by: Mloc <colmohici@gmail.com> commit93352aee2cAuthor: Mloc <colmohici@gmail.com> Date: Wed May 22 10:51:40 2013 +0100 the fuck did I do there. should be fixed now. Signed-off-by: Mloc <colmohici@gmail.com> commitbd2d2311f1Merge:663555233c2b45Author: Mloc <colmohici@gmail.com> Date: Wed May 22 10:36:05 2013 +0100 Merge branch 'master' of github.com:Baystation12/Baystation12 commit6635552ff4Author: Mloc <colmohici@gmail.com> Date: Wed May 22 10:34:46 2013 +0100 Pulls back map changes. Put those in BEF. Signed-off-by: Mloc <colmohici@gmail.com> commit1ca42d0c88Author: Chinsky <krauchinsky@gmail.com> Date: Wed May 22 12:55:15 2013 +0400 Fixed some sharp stuff not being recognized as such. That lead to knives bruising people you stab, for example. commit33c2b45818Merge:77e50578f28b64Author: Chinsky <krauchinsky@gmail.com> Date: Tue May 21 23:56:14 2013 -0700 Merge pull request #2828 from Jamini/master More mapfixes. commit17e31e80a7Merge:5ac00adac0373bAuthor: Chinsky <krauchinsky@gmail.com> Date: Tue May 21 23:34:28 2013 -0700 Merge pull request #2829 from SkyMarshal/zas-cleanup ZAS Cleanup/Tweaks commitac0373b01bAuthor: SkyMarshal <skymarshal1729@gmail.com> Date: Tue May 21 23:14:43 2013 -0700 Mapfix. commit6c8b0c23dcAuthor: SkyMarshal <skymarshal1729@gmail.com> Date: Tue May 21 22:50:21 2013 -0700 Small fixes, updated changelog. commit39df196edcAuthor: SkyMarshal <skymarshal1729@gmail.com> Date: Tue May 21 22:37:50 2013 -0700 Fixed disposal issue. Delayed Jungle setup until after air master initializes Master controller now properly ceases atmos simulation if runtimes occur (and are detected). Cleanup more ZAS stuff. FEA_system.dm, ZAS/ZAS_Turfs.dm, ZAS_Zones.dm. Canisters now autoconnect to portables connectors on creation. (Fixes airlocks not having attached canisters) Doors can now be made which respect directional door types (e.g. windoors and directional firelocks) and is handled better. commit46907066baAuthor: SkyMarshal <skymarshal1729@gmail.com> Date: Mon May 20 23:54:01 2013 -0700 Somgfkuf commit3420b0a6feAuthor: SkyMarshal <skymarshal1729@gmail.com> Date: Mon May 20 20:30:21 2013 -0700 Cleanup Debug.dm and Functions.dm commit252d10fd67Author: SkyMarshal <skymarshal1729@gmail.com> Date: Mon May 20 19:58:48 2013 -0700 Compile fix. commit0ede4e13f9Author: SkyMarshal <skymarshal1729@gmail.com> Date: Mon May 20 19:52:41 2013 -0700 Cleaned up and commented Connection.dm Signed-off-by: SkyMarshal <skymarshal1729@gmail.com> commit8f28b64119Author: Jamini <mobiousjami@gmail.com> Date: Tue May 21 22:46:37 2013 -0400 Mapfixes - Hopefully Signed-off-by: Jamini <mobiousjami@gmail.com> commit77e5057534Merge:2b39eea42a9c4dAuthor: Jim "Apples" <cheeckan@gmail.com> Date: Tue May 21 15:15:33 2013 -0700 Merge pull request #2826 from Jamini/master MASTER - Mapfixes. commit5ac00adbaeMerge:1b0c6b92cb2718Author: Jim "Apples" <cheeckan@gmail.com> Date: Tue May 21 15:14:23 2013 -0700 Merge pull request #2825 from Jamini/bleeding-edge-freeze BEF - Mapfixes. commit42a9c4d731Author: Jamini <mobiousjami@gmail.com> Date: Tue May 21 18:03:21 2013 -0400 Mapfixes. Same fixes as on BEF. These are atmos/bugfixes and should be merged. Signed-off-by: Jamini <mobiousjami@gmail.com> commit2cb27184feAuthor: Jamini <mobiousjami@gmail.com> Date: Tue May 21 17:46:31 2013 -0400 Mapfixes, mostly pipes and wires that were broken in security and medical. Fixed an external airlock, added security cameras. Signed-off-by: Jamini <mobiousjami@gmail.com> commit4885a08b27Author: Chinsky <krauchinsky@gmail.com> Date: Tue May 21 19:24:53 2013 +0400 Added 5 TC uplink to RevHeads. commit1b0c6b942aAuthor: Chinsky <krauchinsky@gmail.com> Date: Tue May 21 18:08:28 2013 +0400 NOW IT COMPILES. Incomplete rename. commitf09803c74dAuthor: meyar <grimreaper219@hotmail.com> Date: Tue May 21 04:30:27 2013 -0400 Fixes Nuke shuttle airlock commit2b39eea44eMerge:048c684c3b9937Author: Chinsky <krauchinsky@gmail.com> Date: Mon May 20 19:58:40 2013 -0700 Merge pull request #2821 from Kilakk/master Security mini map fixes commit1da1592ac2Merge:99fcf1b3b09c8bAuthor: Chinsky <krauchinsky@gmail.com> Date: Mon May 20 16:31:52 2013 -0700 Merge pull request #2818 from CIB/feature Space no longer has a heat_capacity commit3b09c8b3a6Author: cib <cib123@googlemail.com> Date: Tue May 21 00:46:12 2013 +0200 Space no longer has a heat_capacity I mean, seriously? Magical realm of heat absorption? Screw that, space is now room temperature! commitc3b9937db4Author: Kilakk <kilakkindustries@gmail.com> Date: Mon May 20 18:13:03 2013 -0400 Security mini map fixes - Added a missing power cable in the Security Lobby - Added a missing Scrubbers pipe in the Security Lobby - Moved the Armory Exterior camera, which was previously floating - Moved the Gateway, Bridge, and Head of Personnel rechargers back to their rightful place: on a table - Rearranged the caution lines for the SMES units - Added a camera to the Research Shuttle Hallway - Used maptools this time commit99fcf1b3beMerge:71a0ed799ff1f7Author: Chinsky <krauchinsky@gmail.com> Date: Mon May 20 14:34:15 2013 -0700 Merge pull request #2819 from Roaper/master Readded Pockets in the Responder Jackets commit99ff1f7ee0Author: Roaper <roaperable@gmail.com> Date: Mon May 20 13:33:44 2013 -0700 Added Pockets to First Responder Jacket Signed-off-by: Roaper <roaperable@gmail.com> commit048c6845e9Merge:e032e318b43fecAuthor: Chinsky <krauchinsky@gmail.com> Date: Mon May 20 12:36:50 2013 -0700 Merge pull request #2796 from CIB/report_adjustment Experimental report balance change commit71a0ed7049Merge:ccdec121784bcbAuthor: Chinsky <krauchinsky@gmail.com> Date: Sun May 19 04:24:25 2013 -0700 Merge pull request #2812 from caelaislinn/rust RUST updates commite032e3101dMerge:639da5b7067382Author: Chinsky <krauchinsky@gmail.com> Date: Sun May 19 04:24:15 2013 -0700 Merge pull request #2811 from caelaislinn/xenoarch Xenoarch tweaks commit1784bcbb04Merge:454d67dccdec12Author: Cael_Aislinn <cael_aislinn@yahoo.com.au> Date: Sun May 19 19:41:18 2013 +1000 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into rust commit454d67d899Merge:887493e639da5bAuthor: Cael_Aislinn <cael_aislinn@yahoo.com.au> Date: Sun May 19 19:34:10 2013 +1000 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into rust commit887493e1d5Author: Cael_Aislinn <cael_aislinn@yahoo.com.au> Date: Sun May 19 19:33:12 2013 +1000 changes to make testing easier: machinery starts welded+bolted, split up the space loop into a bunch of small ones, added a button for the core shutters Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au> commit7067382f52Author: Cael_Aislinn <cael_aislinn@yahoo.com.au> Date: Sun May 19 19:12:42 2013 +1000 hardcapped xenoarch machinery heat to 177K, made xenoarch machinery only produce heat when scanning, added a couple of missing tools to the gearbelt Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au> commit9d17d24063Author: Cael_Aislinn <cael_aislinn@yahoo.com.au> Date: Sun May 19 19:08:57 2013 +1000 rewrote fusion reactions to use datums instead of a switch statement (with reaction recipes stored in the master controller for debug editing), restructured fusion recipes to be more balanced + gameplay-centric, rewrote fusion reactions to use (mostly) fictional elements, miscellaneous fixes and cleanup Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au> commit751adf7187Author: Cael_Aislinn <cael_aislinn@yahoo.com.au> Date: Sun May 19 19:05:51 2013 +1000 miscellaneous rusk tweaks and fixes including: resolved assembly sprite hiding under things, resolved compressor not producing assemblies with the right amount of matter, made injectors able to be rotated, removed cooldown from injector to port assembly swap, made ejected/created assemblies not appear in the middle of walls (being created from wall-mounted machinery), Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au> commitccdec1201fMerge:a5a0315f12a2cbAuthor: Chinsky <krauchinsky@gmail.com> Date: Sun May 19 02:04:43 2013 -0700 Merge pull request #2808 from CIB/feature Some changes commitebe2e26ed3Author: meyar <grimreaper219@hotmail.com> Date: Sun May 19 05:00:06 2013 -0400 Fixes the Syndicate nuke shuttle airlock (In that it cycles now) Re-added external airlock access to the traitor ID card, restoring lost functionality. Fixed the ERT radio. It now works. commit1d9fe082d7Author: Cael_Aislinn <cael_aislinn@yahoo.com.au> Date: Sun May 19 18:50:15 2013 +1000 made TEG generate power from heat transferred again, restructed TEG and circulator code to be smaller and cleaner, added an "overload" to TEGs where they spark + power output drops if power output exceeds 250k Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au> commitf12a2cb327Author: cib <cib123@googlemail.com> Date: Sun May 19 07:49:07 2013 +0200 Added stasis bags to medbay, engineering and security. commitf5b0b52b6cAuthor: cib <cib123@googlemail.com> Date: Sun May 19 07:48:43 2013 +0200 Added stasis bag. This stops all life functions of a patient for a while. It can only be used once, and inflicts low amounts of brain and clone damage over time. commitac8b64734bAuthor: cib <cib123@googlemail.com> Date: Sun May 19 07:47:18 2013 +0200 Fixed a few problems with newscasters. commitb6231ec33bAuthor: cib <cib123@googlemail.com> Date: Sun May 19 06:03:39 2013 +0200 Added more community news. commit914a9079f0Author: cib <cib123@googlemail.com> Date: Sun May 19 05:56:18 2013 +0200 Added serithi's soundbits as mode sound announcements. commitfc20393b60Merge:8cfc395639da5bAuthor: cib <cib123@googlemail.com> Date: Sun May 19 05:54:14 2013 +0200 Merge branch 'master' of github.com:Baystation12/Baystation12 into feature Conflicts: baystation12.dme commit639da5b25bMerge:ef6d4c81d5dfcbAuthor: Asanadas <asanadas@hotmail.com> Date: Sat May 18 19:11:43 2013 -0700 Merge pull request #2792 from comma/master Sec Wing fixes commit1d5dfcb4dbMerge:b4ff6d2ef6d4c8Author: Chinsky <krauchinsky@gmail.com> Date: Sun May 19 04:51:36 2013 +0400 Merge branch 'master' of https://github.com/Baystation12/Baystation12 Conflicts: baystation12.dme maps/tgstation.2.1.0.0.1.dmm commitef6d4c8a03Merge:6c062dcd7876daAuthor: Chinsky <krauchinsky@gmail.com> Date: Sat May 18 16:30:47 2013 -0700 Merge pull request #2797 from MagmaRam/master Bugfix: Sprite issues on custom cameras (orange camera and old camera) commitd7876da147Merge:fbfa1256c062dcAuthor: MagmaRam <drpepper42yes@gmail.com> Date: Sun May 19 06:21:32 2013 +0700 Merge branch 'master' of https://github.com/Baystation12/Baystation12 Conflicts: icons/obj/custom_items.dmi commita5a0315d0fMerge:68d7c398cfc395Author: Chinsky <krauchinsky@gmail.com> Date: Sat May 18 16:06:35 2013 -0700 Merge pull request #2805 from CIB/feature Fix for recent commit, plus new stories commit8cfc395232Author: cib <cib123@googlemail.com> Date: Sat May 18 23:20:20 2013 +0200 Added community-made newsfeeds. Yay! commit31cbea43f0Author: cib <cib123@googlemail.com> Date: Sat May 18 23:20:06 2013 +0200 Forgot wallrot.dmi commitb4ff6d2a86Merge:f5924d66c062dcAuthor: Chinsky <krauchinsky@gmail.com> Date: Sun May 19 00:53:15 2013 +0400 Merge branch 'master' of https://github.com/Baystation12/Baystation12 Conflicts: maps/tgstation.2.1.0.0.1.dmm commit68d7c3912eMerge:75376af670bf5bAuthor: Chinsky <krauchinsky@gmail.com> Date: Sat May 18 13:20:56 2013 -0700 Merge pull request #2804 from CIB/feature Radiation storms consider maintenance now. commit670bf5bb76Author: cib <cib123@googlemail.com> Date: Sat May 18 22:18:37 2013 +0200 Radiation storms consider maintenance now. Also, a fix to spray(whoops!) commit75376af315Merge:80df80fd7cc42eAuthor: Chinsky <krauchinsky@gmail.com> Date: Sat May 18 12:55:47 2013 -0700 Merge pull request #2799 from CIB/feature Most mobs can emote now. commitd7cc42e588Author: cib <cib123@googlemail.com> Date: Sat May 18 21:55:02 2013 +0200 Added wallrot event. Also some updates to changelog. commit38cdb4d4f5Author: cib <cib123@googlemail.com> Date: Sat May 18 18:17:28 2013 +0200 Most mobs can emote now. Also added CSS to say, so that you can tell apart "say" and "me say" commitfbfa125f4bAuthor: MagmaRam <drpepper42yes@gmail.com> Date: Sat May 18 22:00:15 2013 +0700 Bugfix: Fixed issues with custom item camera sprites icond/obj/custom_items.dmi: renamed off sprite for blue camera code/modules/paperwork/photography.dm: made cameras use variables item_on and item_off for sprites so that other types of cameras (i.e. custom ones) can use their own sprites without getting messed. /code/modules/customitems/item_defines.dm: set sprites for custom cameras "orange camera" and "old camera" to use item_on and item_off sprites in custom_items.dmi so that they had the correct sprites commit8b43fec262Author: cib <cib123@googlemail.com> Date: Sat May 18 15:21:14 2013 +0200 Balance change to suspect list. Antagonists now have a HIGHER chance to be suspected. Simultanously, traitors and other uplink users get another +4 TC and a warning if they are suspected. commit6c062dc05cMerge:dadf37fcd5f088Author: Chinsky <krauchinsky@gmail.com> Date: Sat May 18 06:11:46 2013 -0700 Merge pull request #2793 from meyar/master Fixin' the traitor ID commitdadf37faefMerge:229fb466e85a3eAuthor: Chinsky <krauchinsky@gmail.com> Date: Sat May 18 06:07:10 2013 -0700 Merge pull request #2795 from fauxki/master Fixes for Master commitcd5f0885ffAuthor: meyar <grimreaper219@hotmail.com> Date: Sat May 18 09:06:36 2013 -0400 Adds ERT radio Makes the ERT frequency accessable commit80df80f42fMerge:125991b22ea35cAuthor: Chinsky <krauchinsky@gmail.com> Date: Sat May 18 06:05:08 2013 -0700 Merge pull request #2794 from CIB/feature Many things commit6e85a3ed42Author: faux <alcoholfox@gmail.com> Date: Sat May 18 05:57:21 2013 -0700 Master Bug Fixes - Fixes wall under maintenance tunnel door. - Fixes AAAAHHHHHHHRRG psych office pressure issue. - Fixes some names and DMIs on some items. (in theory) commit22ea35cb8fAuthor: cib <cib123@googlemail.com> Date: Sat May 18 14:18:11 2013 +0200 Added command reports to RP rev. commite932ac76b1Merge:c25bbff229fb46Author: fauxtada <alcoholfox@gmail.com> Date: Sat May 18 04:56:40 2013 -0700 Merge branch 'master' of https://github.com/Baystation12/Baystation12 Conflicts: code/game/objects/structures/crates_lockers/closets/secure/security.dm code/modules/clothing/under/miscellaneous.dm icons/mob/uniform.dmi icons/obj/clothing/uniforms.dmi icons/obj/custom_items.dmi maps/tgstation.2.1.0.0.1.dmm commitc1cefa4a80Author: cib <cib123@googlemail.com> Date: Sat May 18 13:49:45 2013 +0200 Added more debug logging to events. commite2249fa177Author: cib <cib123@googlemail.com> Date: Sat May 18 13:48:57 2013 +0200 Added organ damage random medical event. It doesn't make a lot of sense, but who cares about that! commit90076f017aAuthor: cib <cib123@googlemail.com> Date: Sat May 18 13:17:19 2013 +0200 Added debug logging for events. Something's just not right about events still. commit335565cba7Author: cib <cib123@googlemail.com> Date: Sat May 18 13:10:07 2013 +0200 Made RP rev use a different news story. commitbe197afc77Author: cib <cib123@googlemail.com> Date: Sat May 18 13:06:16 2013 +0200 Added system for newscaster events. This way people can write stories, separated into several pieces, which will be announced through the newscasters over the course of the round. commitc170f57ba7Author: meyar <grimreaper219@hotmail.com> Date: Sat May 18 06:48:01 2013 -0400 Returns lost functionality to the traitor ID, letting a traitor re-forge their ID more than once. commitf5924d6d00Author: Chinsky <krauchinsky@gmail.com> Date: Sat May 18 12:33:51 2013 +0400 Fixes #2788. Added spawnpoints for sec. Fixes #2787. Added cameras to sec wing. Fixes #2783. Added missing Warden's locker. Fixed Armoury and Washroom doors access. Fixed maintenance door below Sec leading into a wall. Removed second maintenance door from Forensics. Leads into same maint tunnel, and it just few steps from another door. Fixed piping on airlock near Sec. Removed non-cycling arilock from near escape pod. There is cycling one nearby. commite4b610207bAuthor: cib <cib123@googlemail.com> Date: Sat May 18 11:34:00 2013 +0200 Make debug log accessible to mods and coders. commit48b78ea758Author: cib <cib123@googlemail.com> Date: Sat May 18 11:06:19 2013 +0200 Re-added latespawn. Used in autotraitor and RP-revolution. commit0da9a4538eAuthor: cib <cib123@googlemail.com> Date: Sat May 18 10:02:37 2013 +0200 New debug log system. You can as admin toggle debug messages, VERY useful for devs and debugging the main server. commit229fb465abMerge:88d5aa609a41d8Author: Chinsky <krauchinsky@gmail.com> Date: Sat May 18 00:10:09 2013 -0700 Merge pull request #2786 from Mordeth221/patch-1 New less obnoxious vote noise commit09a41d83ccAuthor: Mordeth221 <brandonhoward03@hotmail.co.uk> Date: Fri May 17 17:44:39 2013 +0200 New less obnoxious vote noise commita6c995e321Author: Mordeth221 <brandonhoward03@hotmail.co.uk> Date: Fri May 17 11:02:31 2013 +0200 New less obnoxious vote noise And everyone will love this noise too! commit88d5aa6799Merge:5f8b7dbd1862f4 Author: Chinsky <krauchinsky@gmail.com> Date: Fri May 17 07:47:16 2013 +0400 Merge branch 'master' of https://github.com/Jamini/Baystation12 Conflicts: maps/tgstation.2.1.0.0.1.dmm commit5f8b7db6bdMerge:15b00b77b723bfAuthor: Chinsky <krauchinsky@gmail.com> Date: Fri May 17 07:35:21 2013 +0400 Merge branch 'master' of https://github.com/Baystation12/Baystation12 commitd1862f433bAuthor: Jamini <mobiousjami@gmail.com> Date: Thu May 16 23:18:33 2013 -0400 More emergancy fixes. Like singulo escaping fixes. all wiring, all very vital unless you want rounds ending in 30mins Signed-off-by: Jamini <mobiousjami@gmail.com> commit9a8273bf64Author: Jamini <mobiousjami@gmail.com> Date: Thu May 16 23:04:31 2013 -0400 Emergency Map fixes Signed-off-by: Jamini <mobiousjami@gmail.com> commitcbaeb8afafAuthor: fauxtada <alcoholfox@gmail.com> Date: Thu May 16 19:36:52 2013 -0700 the adding of security spawn points removed the pipes underneath them in the security storage room. put pipes back. commit7b723bfb82Merge:25fe7aa125991bAuthor: Chinsky <krauchinsky@gmail.com> Date: Thu May 16 18:30:10 2013 -0700 Merge pull request #2762 from Baystation12/bleeding-edge-freeze BEF merge [waitabit] commit25fe7aab07Merge:0e7b8035b14c50Author: Chinsky <krauchinsky@gmail.com> Date: Thu May 16 18:29:19 2013 -0700 Merge pull request #2779 from Jamini/master Disposals Fix commit5b14c5081cAuthor: Jamini <mobiousjami@gmail.com> Date: Thu May 16 21:26:26 2013 -0400 Adjustment Signed-off-by: Jamini <mobiousjami@gmail.com> commit125991b68dMerge:bfc87845884f24Author: Chinsky <krauchinsky@gmail.com> Date: Thu May 16 18:21:10 2013 -0700 Merge pull request #2778 from SkyMarshal/bleeding-edge-freeze Adjusting air alarm settings. commit0e7b803d8eMerge:db292f4374e950Author: Chinsky <krauchinsky@gmail.com> Date: Thu May 16 18:20:27 2013 -0700 Merge pull request #2761 from havocx42/master Removing reverselist() from all bot pathing. commitd2c9f11b4fAuthor: Jamini <mobiousjami@gmail.com> Date: Thu May 16 21:10:03 2013 -0400 Fixed a disposals bug. Playing with the big garbage pipes is now stupid again. Signed-off-by: Jamini <mobiousjami@gmail.com> commit5884f24f6aAuthor: SkyMarshal <skymarshal1729@gmail.com> Date: Thu May 16 17:29:58 2013 -0700 Adjusting air alarm settings. "Scrubbing" is the default mode "Panic" empties the room "Fill" turns off the scrubbers and activates the vents in an effort to replace lost air "Cycle" will trigger first a panic siphon then a fill mode in order to empty a room of contaminants before refilling it from the supply pipes "Replacement" will turn on the panic siphon while continuing to add air into the room "Off" will disable all attached devices. (This is useful for breached areas) commitbfc8784321Merge:b203bc79d6f132Author: Chinsky <krauchinsky@gmail.com> Date: Thu May 16 15:05:47 2013 -0700 Merge pull request #2776 from SkyMarshal/bleeding-edge-freeze Added small glassdoor airlock and an air alarm to the server room to help prevent cooling of the rooms in that area by heat transfer. Added atmospheric control computer to atmos. commit9d6f1328edAuthor: SkyMarshal <skymarshal1729@gmail.com> Date: Thu May 16 15:04:45 2013 -0700 Added small glassdoor airlock and an air alarm to the server room to help prevent cooling of the rooms in that area by heat transfer. Added atmospheric control computer to atmos. commitb203bc719cMerge:31a01283836252Author: Chinsky <krauchinsky@gmail.com> Date: Thu May 16 14:56:42 2013 -0700 Merge pull request #2775 from fauxki/bleeding-edge-freeze rogue pixel fixes commit3836252b27Author: fauxtada <alcoholfox@gmail.com> Date: Thu May 16 14:55:07 2013 -0700 rogue pixel fixes commit31a0128621Merge:ee374d61ebc8e3Author: Chinsky <krauchinsky@gmail.com> Date: Thu May 16 14:32:08 2013 -0700 Merge pull request #2770 from Kilakk/bleeding-edge-freeze BEF Map fixes/changes commitee374d69c0Merge:92c48fe5039828Author: Chinsky <krauchinsky@gmail.com> Date: Thu May 16 10:46:04 2013 -0700 Merge pull request #2774 from Roaper/master Hey Hey Hey! got it to work! Look at me now mah! commit92c48fe0b2Merge:5faabba98a12adAuthor: Albert Iordache <iordachealbert@gmail.com> Date: Thu May 16 05:08:09 2013 -0700 Merge pull request #2772 from Mloc/bleeding-edge-freeze Fixed up BrokenInHands a little. commit98a12ad82bAuthor: Mloc <colmohici@gmail.com> Date: Thu May 16 13:05:23 2013 +0100 Fixed up BrokenInHands a little. Signed-off-by: Mloc <colmohici@gmail.com> commit5faabba7fbMerge:566454bdb292f4Author: Mloc <colmohici@gmail.com> Date: Thu May 16 12:21:55 2013 +0100 Merge branch 'master' into bleeding-edge-freeze Conflicts: html/changelog.html Signed-off-by: Mloc <colmohici@gmail.com> commit566454b4c2Author: Mloc <colmohici@gmail.com> Date: Thu May 16 12:35:59 2013 +0200 gave debuggers proccall back commit1ebc8e3b91Author: Kilakk <kilakkindustries@gmail.com> Date: Wed May 15 20:35:23 2013 -0400 BEF Map fixes/changes - Added spawnpoints for Security, Warden, and HoS - Moved some stuff around in Warden's office - Added the mysteriously missing Warden's locker - Changed the direction of a few windoors in the Brig - Made closing doors behind you in the Brig significantly easier - Added a camera to the Research Shuttle hallway - You no longer need Power Equipment access to enter the Engineering Lobby (Access to the engine still needs Power Equipment) commit5039828944Author: Ian O'Malley <roaperable@gmail.com> Date: Wed May 15 15:55:58 2013 -0700 4th times the charm. Added some stuff onto code/modules/events/money_spam.dm Added some stuff onto code/modules/flufftext/Dreaming.dm Signed-off-by: Ian O'Malley <roaperable@gmail.com> commit4f35f581c0Merge:e0f22c96e2879dAuthor: Chinsky <krauchinsky@gmail.com> Date: Wed May 15 14:37:07 2013 -0700 Merge pull request #2768 from SkyMarshal/bleeding-edge-freeze Air alarm fix, atmos control computer fix, item description fix. commit6e2879dc74Author: SkyMarshal <skymarshal1729@gmail.com> Date: Wed May 15 14:36:32 2013 -0700 Made an oopsie commit88a65b63e4Author: SkyMarshal <skymarshal1729@gmail.com> Date: Wed May 15 14:31:31 2013 -0700 Fixes air alarms going off if the upper bounds were set to disabled. Fixes atmos control computer displaying some air alarms in unreadable yellow Fixes a text error in item descriptions. commite0f22c9931Author: Mloc <colmohici@gmail.com> Date: Wed May 15 22:52:25 2013 +0200 Turn off control_freak for profiling and stuff. commit5b177df027Merge:917ce07a1bc5d6Author: Mloc <colmohici@gmail.com> Date: Wed May 15 13:29:15 2013 -0700 Merge pull request #2766 from SkyMarshal/bleeding-edge-freeze Fixes air alarms freezing station an hour into round. commita1bc5d6cf0Author: SkyMarshal <skymarshal1729@gmail.com> Date: Wed May 15 13:28:27 2013 -0700 Fixes air alarms freezing station an hour into round. commit917ce079abMerge:2c0d1c82b9130bAuthor: Chinsky <krauchinsky@gmail.com> Date: Wed May 15 11:35:15 2013 -0700 Merge pull request #2763 from fauxki/bleeding-edge-freeze Quick Fixes - BEF commit2b9130b00fAuthor: fauxtada <alcoholfox@gmail.com> Date: Wed May 15 11:26:26 2013 -0700 Quick Fixes - Changed access to security washroom so detective can go in. - Removed wall that was under maintence tunnel door. - Fixed writerer's custom item. AGAIN. .. Because they can't decide what character they want it on. - Added saloon dress to bar closet. commit15b00b733dMerge:b2ba6502c0d1c8Author: Chinsky <krauchinsky@gmail.com> Date: Wed May 15 20:13:35 2013 +0400 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 commit374e950a32Author: Laurence Reading <havoc42@gmail.com> Date: Wed May 15 16:50:24 2013 +0100 Removing reverselist() from all bot pathing As with my previous commit, reverselist() is causing problems in bot pathing, it is unnecessary. Bot pathing only worked when reverselist() was doing nothing. commit2c0d1c85e8Merge:345c2b162666d3Author: Christian Bielert <cib123@googlemail.com> Date: Tue May 14 18:01:12 2013 -0700 Merge pull request #2758 from Jamini/bleeding-edge-freeze Adjustments to engineering based on community feedback. commit62666d34a6Author: Jamini <mobiousjami@gmail.com> Date: Tue May 14 18:25:29 2013 -0400 Adjustments to engineering based on community feedback. Added magboots to the non-engineering hardsuit spawns in EVA. Signed-off-by: Jamini <mobiousjami@gmail.com> commit345c2b1f3cMerge:7ba1a22bb06a18Author: Mloc <colmohici@gmail.com> Date: Tue May 14 12:24:09 2013 -0700 Merge pull request #2752 from CIB/feature Improved the command report commit7ba1a22518Merge:dc6cf5132ea629Author: Mloc <colmohici@gmail.com> Date: Tue May 14 12:23:03 2013 -0700 Merge pull request #2756 from AppleMaster/master Maybe probably fixes some custom item? commitbb06a18c33Author: cib <cib123@googlemail.com> Date: Tue May 14 21:12:47 2013 +0200 Reduced chance for changeling to be listed as suspect. Better than discussing this forever. commit32ea629eb3Author: Apple_Master <cheeckan@gmail.com> Date: Tue May 14 18:09:20 2013 +0100 Maybe fixes some custom items? Signed-off-by: Apple_Master <cheeckan@gmail.com> commitdc6cf51309Merge: c99fec1ad6105bAuthor: Chinsky <krauchinsky@gmail.com> Date: Tue May 14 07:37:27 2013 -0700 Merge pull request #2754 from CIB/bleeding-edge-freeze Merge main into BEF commitad6105b380Merge: c99fec18af44c5Author: cib <cib123@googlemail.com> Date: Tue May 14 01:29:45 2013 +0200 Merge remote-tracking branch 'main/master' into bleeding-edge-freeze Conflicts: html/changelog.html commitd12c3f9cf3Author: cib <cib123@googlemail.com> Date: Tue May 14 00:58:49 2013 +0200 Added a missing linebreak. commit28b40c3693Author: cib <cib123@googlemail.com> Date: Tue May 14 00:39:29 2013 +0200 New command reports that aren't stupid. It will give you a list of suspects, which uses a lot of randomization to gather up anti-NT guys, actual antags, and random people. commitc99fec15efMerge:1f1e37b697ab3dAuthor: Chinsky <krauchinsky@gmail.com> Date: Mon May 13 10:57:53 2013 -0700 Merge pull request #2748 from SkyMarshal/bleeding-edge-freeze Centcom now has sexy uniforms and IDs. Emag now looks like modified standard ID card again. commit1f1e37b27eMerge:e77e9055b2f03dAuthor: Chinsky <krauchinsky@gmail.com> Date: Mon May 13 10:57:05 2013 -0700 Merge pull request #2749 from fauxki/bleeding-edge-freeze Map Fixes - BEF commit5b2f03db10Author: fauxtada <alcoholfox@gmail.com> Date: Sat May 11 09:33:45 2013 -0700 Map Fixes - BEF - adjusts the piping and flooring panels in the new security wing. - fixes the piping around the new eva since they lead to nowhere. - adjusted the medbay lobby a bit, added a second chair behind the front desk. - added in a xenos closet. has unathi items / wooden sandals in it currently. still need to sprite up the tajaran and skrell items. commit697ab3dd7fAuthor: SkyMarshal <skymarshal1729@gmail.com> Date: Sat May 11 03:34:14 2013 -0700 Centcom now has sexy uniforms and IDs. Emag now looks like modified standard ID card commite77e905c00Merge:52583c561cf1b2Author: Mloc <colmohici@gmail.com> Date: Sat May 11 02:18:15 2013 -0700 Merge pull request #2745 from comma/bleeding-edge-freeze Sec Wing remap commit52583c53b2Merge:5b134451726949Author: Mloc <colmohici@gmail.com> Date: Sat May 11 02:16:47 2013 -0700 Merge pull request #2744 from Spamcat/bef fixes commit61cf1b279dAuthor: Chinsky <krauchinsky@gmail.com> Date: Fri May 10 15:55:34 2013 +0400 Security wing remap. commita9883979ceMerge:1745bef5b13445Author: Chinsky <krauchinsky@gmail.com> Date: Fri May 10 15:28:32 2013 +0400 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze Conflicts: code/controllers/voting.dm commit5b13445e95Merge:849ec507118addAuthor: Mloc <colmohici@gmail.com> Date: Wed May 8 11:27:37 2013 -0700 Merge pull request #2743 from SkyMarshal/bleeding-edge-freeze Fixes some runtimes as well as a merge-related bug that made heat not transfer through doors. commit7118add9daAuthor: SkyMarshal <skymarshal1729@gmail.com> Date: Wed May 8 11:26:38 2013 -0700 Fixes some runtimes as well as a merge-related bug that made heat not transfer through doors. commit17269494efAuthor: Spamcat <spamcat@derpy.ru> Date: Wed May 8 15:13:28 2013 +0400 fixed #2737 commit0decd3b078Author: Spamcat <spamcat@derpy.ru> Date: Wed May 8 15:12:25 2013 +0400 Air alarm runtimes. fixed #2717 commit849ec5052aAuthor: Mloc-Argent <colmohici@gmail.com> Date: Mon May 6 16:09:10 2013 +0100 Fix for compiling on case sensitive filesystems. Signed-off-by: Mloc-Argent <colmohici@gmail.com> commit80e49b830eAuthor: Mloc-Argent <colmohici@gmail.com> Date: Mon May 6 16:02:26 2013 +0100 obligatory whoops! Signed-off-by: Mloc-Argent <colmohici@gmail.com> commit0c820277c8Merge:27759f4dad4430Author: Mloc-Argent <colmohici@gmail.com> Date: Mon May 6 15:45:09 2013 +0100 Merge branch 'master' of github.com:Baystation12/Baystation12 into emergency-bef commit27759f47dfMerge:c33af03ba8a159Author: Mloc-Argent <colmohici@gmail.com> Date: Mon May 6 15:43:50 2013 +0100 Merged master into BEF. Signed-off-by: Mloc-Argent <colmohici@gmail.com> commitb2ba65001eAuthor: Chinsky <krauchinsky@gmail.com> Date: Sun May 5 20:24:33 2013 +0400 Runtime fix. IV injecting from empty blood pack caused it. Now not doing a thing if no blood is injected. commitc33af034d0Merge:45c9a3cb718bf5Author: Chinsky <krauchinsky@gmail.com> Date: Thu May 2 06:55:18 2013 -0700 Merge pull request #2732 from Mloc/bleeding-edge-freeze Makes change game mode votes in pre-game lobby delay the roundstart. commitb718bf5bf9Author: Mloc <colmohici@gmail.com> Date: Thu May 2 14:07:11 2013 +0100 Makes change game mode votes in pre-game lobby delay the roundstart. Fixes #2686. Signed-off-by: Mloc <colmohici@gmail.com> commit45c9a3cfd5Merge:48caebbcdb3466Author: Mloc <colmohici@gmail.com> Date: Thu May 2 05:15:38 2013 -0700 Merge pull request #2731 from fauxki/bleeding-edge-freeze bef - security office door fix / hop attire closet commitcdb3466cd9Author: fauxtada <alcoholfox@gmail.com> Date: Thu May 2 03:19:23 2013 -0700 may or may not fix issue of missing sprite for captain's uniform jacket. commitfed2bfcedcAuthor: fauxtada <alcoholfox@gmail.com> Date: Thu May 2 02:00:04 2013 -0700 fixed michael guess' zippo, added therapy doll dmis to code, the items aren't coded because i cannot get it to work for the life of me. commite384c90093Author: fauxtada <alcoholfox@gmail.com> Date: Tue Apr 30 02:37:43 2013 -0700 minor changes - Fixed accesses to security office doors. - Added a second HoP closet for attire purposes. Armor and guns in one closet - fancy clothes in the second one. - Fixed Writerer's custom item thing. Was attached to wrong character. commitc25bbff8f0Author: fauxtada <alcoholfox@gmail.com> Date: Tue Apr 30 01:18:17 2013 -0700 fixed writerer's custom item commitbeaf1abd45Author: fauxtada <alcoholfox@gmail.com> Date: Tue Apr 30 01:06:05 2013 -0700 minor changes - Fixed security accesses to the security office doors. - Put in a second HoP closet just for alternate uniforms for the HoP. Because the HoP uniform is piss ugly. commit48caebb9fbMerge:37b6e1e74b4b26Author: Chinsky <krauchinsky@gmail.com> Date: Sun Apr 28 04:55:11 2013 -0700 Merge pull request #2716 from Jamini/bleeding-edge-freeze Minor mapfixes commit37b6e1e691Merge:7c4be6e9d83bd5Author: Chinsky <krauchinsky@gmail.com> Date: Sun Apr 28 04:54:39 2013 -0700 Merge pull request #2719 from jediluke69/bleeding-edge-freeze Fixs my error in drinks and adds a shotgun shell ammo crate commit9d83bd52b5Author: jediluke69 <zc96600@gmail.com> Date: Sat Apr 27 21:42:49 2013 -0400 Added a shotgun shell ammo crate commita87a2abb37Author: jediluke69 <zc96600@gmail.com> Date: Sat Apr 27 20:14:51 2013 -0400 Milkshakes and Rewriter should now have effects commite54b172a09Author: jediluke69 <zc96600@gmail.com> Date: Sat Apr 27 19:53:06 2013 -0400 fixes my silly mistake on drink results... commit74b4b26aefAuthor: Jamini <mobiousjami@gmail.com> Date: Sat Apr 27 09:11:38 2013 -0400 Minor mapfixes Fixed wiring in sec office, removed redundant sec hardsuits, fixed some poorly placed firelocks, fixed a few names on doors, corrected EVA entrance access. Signed-off-by: Jamini <mobiousjami@gmail.com> commit7c4be6eea9Merge:21ee07fbff28aaAuthor: Hawk-v3 <hawk.v3@ntlworld.com> Date: Fri Apr 26 12:57:33 2013 -0700 Merge pull request #2710 from Jamini/bleeding-edge-freeze EVA and Engineering change voted by the community. commitbff28aa174Author: Jamini <mobiousjami@gmail.com> Date: Fri Apr 26 07:24:15 2013 -0400 Engineering V5, voted by the community. Redid it trying to use the maptools (which still never seem to work for me!) Signed-off-by: Jamini <mobiousjami@gmail.com> commitc3cdcf226dAuthor: Jamini <mobiousjami@gmail.com> Date: Fri Apr 26 00:27:51 2013 -0400 EVA and Engineering change voted by the community. Engineering V5 or something like that. Signed-off-by: Jamini <mobiousjami@gmail.com> commit21ee07f82dMerge:b2cecc548a6326Author: Chinsky <krauchinsky@gmail.com> Date: Thu Apr 25 11:00:33 2013 -0700 Merge pull request #2707 from fauxki/bleeding-edge-freeze custom items update commitb2cecc5028Merge:51f438dd9d09f7Author: Jim "Apples" <cheeckan@gmail.com> Date: Thu Apr 25 10:47:30 2013 -0700 Merge pull request #2705 from jediluke69/bleeding-edge-freeze less robusty nanopaste commit48a6326747Author: fauxtada <alcoholfox@gmail.com> Date: Thu Apr 25 00:57:55 2013 -0700 custom items update - Michael Guess' golden lighter - Krinn's saucepan hat - Writerer's cat thing commitd9d09f7b1dAuthor: jediluke69 <zc96600@gmail.com> Date: Wed Apr 24 20:18:09 2013 -0400 updated the Dreaded changelog commite256f2d095Author: jediluke69 <zc96600@gmail.com> Date: Wed Apr 24 19:41:51 2013 -0400 should nerf nanopaste commit51f438dfdbMerge:69cb68785eb0f1Author: Christian Bielert <cib123@googlemail.com> Date: Wed Apr 24 16:24:58 2013 -0700 Merge pull request #2703 from jediluke69/bleeding-edge-freeze Adds new drinks and fixes a few things commit85eb0f1224Author: jediluke69 <zc96600@gmail.com> Date: Wed Apr 24 18:48:55 2013 -0400 Adds new drinks and fixes a few things commit69cb68732bMerge:81d991aa710179Author: Chinsky <krauchinsky@gmail.com> Date: Wed Apr 24 13:24:25 2013 -0700 Merge pull request #2699 from NerdyBoy1104/bleeding-edge-freeze Changelog update~ commita710179c9dAuthor: NerdyBoy1104 <NerdyBoy1104@gmail.com> Date: Wed Apr 24 19:17:11 2013 +0100 Changelog update~ includes a small typo fix to faux's recent update too. commit61600803edMerge:78e934e711577bAuthor: NerdyBoy1104 <NerdyBoy1104@gmail.com> Date: Wed Apr 24 19:09:24 2013 +0100 Merge branch 'bleeding-edge-freeze' of https://github.com/NerdyBoy1104/Baystation12 into bleeding-edge-freeze Conflicts: html/changelog.html commit78e934e0d0Author: NerdyBoy1104 <NerdyBoy1104@gmail.com> Date: Wed Apr 24 18:58:45 2013 +0100 Changelog update~ includes a fixed version of faux's changelog commit711577b73cAuthor: NerdyBoy1104 <NerdyBoy1104@gmail.com> Date: Wed Apr 24 18:58:45 2013 +0100 Changelog update~ includes a fixed version of faux's changelog commit1745befd08Merge:b6597c181d991aAuthor: Chinsky <krauchinsky@gmail.com> Date: Wed Apr 24 21:54:00 2013 +0400 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze commit81d991a417Merge:47b28e5a31bdffAuthor: Chinsky <krauchinsky@gmail.com> Date: Wed Apr 24 10:52:24 2013 -0700 Merge pull request #2696 from fauxki/bleeding-edge-freeze BEF - Player Requests Update commita31bdfffaaAuthor: fauxtada <alcoholfox@gmail.com> Date: Wed Apr 24 10:45:54 2013 -0700 changelog commitc1991ba0ddAuthor: fauxtada <alcoholfox@gmail.com> Date: Wed Apr 24 03:04:35 2013 -0700 Player Requests Edition - Two canes will spawn in medbay storage for people with leg injuries. - Added some more welding goggles for engineers in engineering. - Armory has a second security hardsuit. - CMO has hallway access to the medbay hardsuits. - HoS hat spawns in HoS closet. - White wedding dress spawns in chaplain closet. - Removed Pulse Rifle and Laser Canon from ERT room. - Detective's office will now start off with a cigeratte pack and a detective's flask. - Three normal boring flasks now spawn behind the bar for the bartender to give out. - Old Man Suit spawns in laundry room. - Requested by Book. - Roaper's Callum suit ( http://baystation12.net/forums/viewtopic.php?f=33&t=7047 ) now spawns in under Knockoff Suit. It may or may not spawn in for him too, I don't know how this shit works but I think I got it right. - Removed Roaper's items for Ian Colm. At least the code part, I don't know if I'm supposed to delete the DMIs or not so I left them in. commit47b28e5cceMerge:c8b800e272d792Author: Chinsky <krauchinsky@gmail.com> Date: Tue Apr 23 16:15:05 2013 -0700 Merge pull request #2690 from fauxki/bleeding-edge-freeze Bleeding edge freeze - Map / Clothing changes commitc8b800e6d9Merge:630af663900290Author: Chinsky <krauchinsky@gmail.com> Date: Tue Apr 23 16:12:36 2013 -0700 Merge pull request #2695 from NerdyBoy1104/bleeding-edge-freeze Small Hydroponics update. commit630af66468Merge:5e653633bff68aAuthor: Chinsky <krauchinsky@gmail.com> Date: Tue Apr 23 16:09:04 2013 -0700 Merge pull request #2693 from Mordeth221/bleeding-edge-freeze Custom APLU with fix commit390029007dAuthor: NerdyBoy1104 <NerdyBoy1104@gmail.com> Date: Tue Apr 23 22:51:57 2013 +0100 Added Rice and Plastellium plants. Rice stalks are grinded into rice that you can make boiled rice, rice pudding and Sake from. Plastellium is refined into plastic by grinding it into plasticide. 20 plasticide + 10 poly acid makes 10 sheets of platic which can be used to make crates, forks, spoons, knives, ashtrays or plastic bags from. commit3bff68a9a2Author: Mordeth221 <brandonhoward03@hotmail.co.uk> Date: Tue Apr 23 23:11:12 2013 +0200 Fixed icon_state of sven-kit to sven_kit commit83719e09deAuthor: Mordeth221 <altbrandon@hotmail.co.uk> Date: Tue Apr 23 21:37:40 2013 +0100 Fixed a silly mistake commit76b2941803Author: Mordeth221 <altbrandon@hotmail.co.uk> Date: Tue Apr 23 18:56:44 2013 +0100 Added custom APLU commit272d7925cfAuthor: fauxtada <alcoholfox@gmail.com> Date: Mon Apr 22 13:29:23 2013 -0700 Sorry, sorry! The last commit was full of compiling errors, this fixes that one. commit44a67167b3Author: fauxtada <alcoholfox@gmail.com> Date: Sun Apr 21 22:50:52 2013 -0700 Uniform Closet Changes - Adjusted the items that spawn in the mixed wardrobe. Now includes: --- Colorful shoes. --- Plaid Skirts. Lady Power. --- Leather shoes. - Put dispatcher uniform in security closet for playtesting purposes. - Nurse dress, orderly uniform, and first responder jacket now spawn in medical closet. Man that thing is full of stuff. commit47fcd8fc11Author: fauxtada <alcoholfox@gmail.com> Date: Sun Apr 21 22:13:27 2013 -0700 Map Changes - Turned the meeting hall into a public security office. -- http://baystation12.net/forums/viewtopic.php?f=5&t=7425 - Moved posibrain to robotics. - Put a camera in the Psych office. - Hopefully fixed the APC on the floor in virology. - Got rid of green wardrobe closets - Replaced them with mixed wardrobe closets. I'm going to rework what spawns in them in a different commit. commitb6597c1310Merge:d58ef355e65363Author: Chinsky <krauchinsky@gmail.com> Date: Sat Apr 20 12:11:52 2013 +0400 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze Conflicts: code/modules/surgery/braincore.dm commit5e65363332Merge:19fd2620f570b5Author: Chinsky <krauchinsky@gmail.com> Date: Sat Apr 20 01:00:47 2013 -0700 Merge pull request #2681 from SkyMarshal/master XenoArch computer fix for BEF commit0f570b5dc8Author: SkyMarshal <skymarshal1729@gmail.com> Date: Fri Apr 19 16:34:50 2013 -0700 Same XenoArch computer fix as in master branch. commit19fd262d0aMerge:bc218626a38e51Author: Jim "Apples" <cheeckan@gmail.com> Date: Fri Apr 19 02:02:27 2013 -0700 Merge pull request #2677 from SkyMarshal/bugfixes Atmos control auto-update fixes and other things. commit6a38e51c73Author: SkyMarshal <skymarshal1729@gmail.com> Date: Fri Apr 19 01:43:58 2013 -0700 Atmos control auto-update fixes Air alarms now auto-refresh and have a mechanism to heat or cool rooms. Space heaters can both heat and cool rooms commitbc218625d8Merge:811fdf466cdc1aAuthor: Chinsky <krauchinsky@gmail.com> Date: Thu Apr 18 22:37:02 2013 -0700 Merge pull request #2675 from SkyMarshal/bugfixes Fixes #2674 commit66cdc1a493Author: SkyMarshal <skymarshal1729@gmail.com> Date: Thu Apr 18 16:58:31 2013 -0700 Fixes the runtimes. commit811fdf4774Merge:b3669982637c4dAuthor: Jim "Apples" <cheeckan@gmail.com> Date: Thu Apr 18 12:48:02 2013 -0700 Merge pull request #2673 from SkyMarshal/bugfixes See description commit2637c4d3dbAuthor: SkyMarshal <skymarshal1729@gmail.com> Date: Thu Apr 18 12:32:46 2013 -0700 Readds air alarms that drop firelocks as well as the Central Atmos Control computer commitef38bc91bfAuthor: SkyMarshal <skymarshal1729@gmail.com> Date: Thu Apr 18 12:10:20 2013 -0700 Fixed some bugs with ZAS closed connections Sped up air equalization between zones Fixed an issue where space tiles were not removed from the zone. Made ZAS debug functions accessible when the mapping verbs are toggled on. commit846a8ec906Author: SkyMarshal <skymarshal1729@gmail.com> Date: Wed Apr 17 23:35:58 2013 -0700 Experimental ZAS capability for heat to transfer through closed doors. commit1ccceb0e6dAuthor: SkyMarshal <skymarshal1729@gmail.com> Date: Wed Apr 17 22:46:34 2013 -0700 Fixes an issue with fire leaving the trace_gases list full of nulls and revert some more of whatever Cael had done to that poor air-movement procedure. commitb0d1d47c23Author: SkyMarshal <skymarshal1729@gmail.com> Date: Wed Apr 17 22:07:41 2013 -0700 Fixes lighting, backpacks getting contaminated, and bombs not working. commit55183ca30aAuthor: SkyMarshal <skymarshal1729@gmail.com> Date: Wed Apr 17 06:34:45 2013 -0700 Fix for lighting before roundstart. commit9cf3ca497eAuthor: SkyMarshal <skymarshal1729@gmail.com> Date: Wed Apr 17 02:05:51 2013 -0700 Changeloooog~ commit7827eec629Author: SkyMarshal <skymarshal1729@gmail.com> Date: Wed Apr 17 01:51:18 2013 -0700 Plasma no longer contaminates backpacks (They cannot be washed) Increased speed of zone equalization. Lighting controller and ticker now initialized after world is set up and a player has joined. commit2de1809c70Author: SkyMarshal <skymarshal1729@gmail.com> Date: Wed Apr 17 01:36:05 2013 -0700 Airflow now prevents doors being bumped open. Plasma settings changed as per Cacophony Airflow defaults changed as per Cacophony Plasma now has an effect other than what happens when breathed. (contamination readded) Washing machines now clean off contamination. commit76d561f003Author: SkyMarshal <skymarshal1729@gmail.com> Date: Wed Apr 17 00:45:36 2013 -0700 Activated magboots will now, definitely, prevent airflow based grieving of your personage. (Included is a possible fix for airflow opening doors by throwing you at them) Added in code to debug ZAS tile interactions, currently in the unchecked "Debug" file. The blasted FloodFill proc now works properly, and zones are connecting right (Should finally fix that damn part of medbay not connecting to the hallway) Plasma can contaminate again. The master controller and world startup code has been reworked for faster server boots. Fixed a runtime originating from a Away Mission map trying to create objects of type "null" commit690d6bbf06Author: SkyMarshal <skymarshal1729@gmail.com> Date: Tue Apr 16 12:43:19 2013 -0700 Fixes the bug with Filters allowing insane overpressurization. commite51c3ce3f0Author: Jupotter <jupotter.g@gmail.com> Date: Sat Apr 13 13:16:28 2013 +0300 Fix a wrong null check in posibrain A wrong nullcheck that prevent posibrain searching for a player commitca4eb6431bAuthor: Jupotter <jupotter.g@gmail.com> Date: Sat Apr 13 11:58:58 2013 +0300 Add check forposibrain without brainmob This should never happen, but check nonetheless. commitedba034413Author: jupotter <jupotter.g@gmail.com> Date: Fri Apr 12 19:16:08 2013 +0200 Fix posibrain not turning off if no candidate The reset proc was checking for the presence of a brainmob, while one was created in the constructor. It should rather check the presence of a key commit96cefa4397Author: SkyMarshal <skymarshal1729@gmail.com> Date: Thu Apr 11 12:19:35 2013 -0700 Compile fix. commit710e97bcc6Author: SkyMarshal <skymarshal1729@gmail.com> Date: Thu Apr 11 12:14:47 2013 -0700 fuel is now a bit less derpy. Napalm produces volatile fuel, and less of it. Fire consumes more welding fuel. commit81c0c5cb6dAuthor: SkyMarshal <skymarshal1729@gmail.com> Date: Thu Apr 11 11:50:29 2013 -0700 Napalm can now be made, due to fire changes. commit5c5b7028b0Author: SkyMarshal <skymarshal1729@gmail.com> Date: Thu Apr 11 11:21:22 2013 -0700 Fire update. Should now burn out after a time, and temperature varies on a number of conditions. Fixed a runtime, and made fire work in canisters. Ingame modification of ZAS is now possible again. Firedoors now remove duplicate firedoors on the same turf. commit2f6fdf556dAuthor: Ravensdale <Tri@rdinn.com> Date: Tue Apr 16 08:47:23 2013 -0700 final tweak for cap's PDA to do as advertised. commitcda1248be7Author: Ravensdale <Tri@rdinn.com> Date: Tue Apr 16 08:43:19 2013 -0700 Bugfix: Adds in a check to make sure atmos code has been loaded before trying to generate, preventing some runtimes. Tweak: Removes captain's armour from spawn code. Tweak: Captain's PDA now spawns with messenger on but is now undetonateable. commit6316d28208Author: Ravensdale <Tri@rdinn.com> Date: Fri Apr 12 10:37:48 2013 -0700 comments out suethecake's gun due to having a weapon's ban commit2272fbe255Author: Asanadas <asanadas@hotmail.com> Date: Tue Apr 9 18:34:14 2013 -0400 Mixing napalm is incredibly broken with ZAS / not found on our wiki because it's a "secret recipe" so I figure let's just comment it out. commitfd08c89e0dAuthor: Asanadas <asanadas@hotmail.com> Date: Tue Apr 9 18:33:37 2013 -0400 Version 11 of RowtreeStation.dmm commitf05b8e0083Author: SkyMarshal <skymarshal1729@gmail.com> Date: Mon Apr 8 23:59:42 2013 -0700 Fixes issues: #2632 Fire Issues (Fire doors work, Flamethrower reverted to making a flamethrower liquid fuel subtype, flame grenades now make a puddle of welder fuel that is lit aflame with napalm) #2630 (The code has been calling (turf).temperature_expose when it was supposed to be hotspot_expose), #1865 (aqain)(Added a check to remove trace gas fuel under a certain point). Also: added a flashpoint value for plasma, which is the temperature at which it self-ignites (Currently 246C or 519K which is equal to gasoline) Partial-tile firedoors now default to full-tile firedoors as the part-tile ones were breaking ZAS zones entirely. Possible cause of #2627 and maybe #2451, but those need tested and I did not have time. commitb366998eebMerge:cfdd9553fa1314Author: Chinsky <krauchinsky@gmail.com> Date: Thu Apr 18 04:42:42 2013 -0700 Merge pull request #2668 from fauxki/bleeding-edge-freeze Bleeding edge freeze - Swimsuits, Jacket, Formal Wear commit3fa1314c01Author: fauxtada <alcoholfox@gmail.com> Date: Wed Apr 17 22:03:38 2013 -0700 Fancy Formal Wear Overhaul - Adds female dress unforms to Captains, RD, and HoP's closets. - Fixes up the bride's dresses so they are working when spawned. - Fixed Wedding Branch. - five wedding dresses. - Added Dress Branch. - twelve dresses - that's including dresses moved over from the wedding branch. commit0d2598c55aAuthor: fauxtada <alcoholfox@gmail.com> Date: Wed Apr 17 18:22:15 2013 -0700 Adds female swimsuits to the atheltics closet. In theory. So no more certain female players running around the beach with their titties hanging out... In theory. commit98a8ebab4bAuthor: fauxtada <alcoholfox@gmail.com> Date: Wed Apr 17 17:02:48 2013 -0700 Added Captain's Jacket to the Captain's Closet. Chinsky showed me how to do this, so I don't know how well it was done. commitcfdd955361Merge:a265a93e40ff1bAuthor: Chinsky <krauchinsky@gmail.com> Date: Wed Apr 17 04:52:54 2013 -0700 Merge pull request #2660 from Spamcat/bleeding-edge-freeze Folding batons commite40ff1bfc4Author: Spamcat <spamcat@derpy.ru> Date: Wed Apr 17 14:21:44 2013 +0400 No need for dis shit. commita265a9342bMerge:75814fc3b95bf2Author: Chinsky <krauchinsky@gmail.com> Date: Tue Apr 16 16:15:05 2013 -0700 Merge pull request #2661 from adammartinez271828/bleeding-edge-freeze Updates to sun.dm and solar.dm commit44401cf03eAuthor: Spamcat <spamcat@derpy.ru> Date: Mon Apr 15 22:23:09 2013 +0400 Fixed blood overlays for batons. Also,changelog. commit75814fc6e0Merge:0ea5010b3c9484Author: Chinsky <krauchinsky@gmail.com> Date: Mon Apr 15 05:47:31 2013 -0700 Merge pull request #2658 from SniperYeti/bleeding-edge-freeze Custom item: Engineering Hat commitd8f825894aAuthor: Spamcat <spamcat@derpy.ru> Date: Mon Apr 15 02:47:48 2013 +0400 Telescopic baton, biatch. Bastard child of baton and energy sword. Added one in HoS's locker. commitb3c9484398Author: Yeti <mryeti97@gmail.com> Date: Sat Apr 13 14:32:11 2013 -0400 Added Superboredguy's item: Engineering Hat commit0ea501039bMerge:8c17d444928a3aAuthor: Chinsky <krauchinsky@gmail.com> Date: Sat Apr 13 01:03:20 2013 -0700 Merge pull request #2655 from SniperYeti/bleeding-edge-freeze Custom item: Old Camera commit8c17d44757Merge:97b10f67d6b903Author: Chinsky <krauchinsky@gmail.com> Date: Sat Apr 13 00:59:29 2013 -0700 Merge pull request #2651 from Spamcat/bleeding-edge-freeze Emergency smooth movement fix. commit4928a3aa59Author: Yeti <mryeti97@gmail.com> Date: Fri Apr 12 22:40:24 2013 -0400 Custom item: Old Camera commit7d6b903ed5Author: Spamcat <spamcat@derpy.ru> Date: Thu Apr 11 22:45:27 2013 +0400 Fixed AI wiring. Ravensdale, thanks for the heads-up. commit13f34207e7Author: Spamcat <spamcat@derpy.ru> Date: Thu Apr 11 22:19:42 2013 +0400 Emergency smooth movement fix. Seriously, stop that. Or at least test the map before committing. And use maptools ffs. :/ commit97b10f69afMerge:fcf129bc624f54Author: Chinsky <krauchinsky@gmail.com> Date: Wed Apr 10 02:57:57 2013 -0700 Merge pull request #2647 from RavingManiac/bleeding-edge-freeze Sprites for narrow carpets altered to be less eye-meltingly baroque. commitc624f54721Author: RavingManiac <heisen51@gmail.com> Date: Wed Apr 10 01:36:59 2013 +0800 Sprites for narrow carpets altered to be less eye-meltingly baroque. commitfcf129b242Merge:b283a3c62867f0Author: Chinsky <krauchinsky@gmail.com> Date: Tue Apr 9 03:16:03 2013 -0700 Merge pull request #2645 from fauxki/bleeding-edge-freeze Bleeding edge freeze - Map Edits commit62867f03f0Author: fauxtada <alcoholfox@gmail.com> Date: Tue Apr 9 03:06:54 2013 -0700 Map Changes: - Replaced the boxing ring with a swimming pool. The holodeck already has a boxing ring setting, the other one is redundant. - Apparently having two airlocks in the same time makes ZAS not work so well. I've edited as many double airlocks as I could find, but there's probably more. - The Psych office is less ugly now. I can't really do anything about there being a see through door though. - No privacy for you! - Violin has been moved to theatre storage. commitefd65fe495Merge:0a736e7b283a3cAuthor: fauxtada <alcoholfox@gmail.com> Date: Tue Apr 9 00:51:17 2013 -0700 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze commitb283a3cb86Merge:4293e30830f08fAuthor: Chinsky <krauchinsky@gmail.com> Date: Sun Apr 7 21:48:14 2013 -0700 Merge pull request #2634 from RavingManiac/bleeding-edge-freeze Various map tweaks commit3b95bf2279Author: adammartinez271828 <adam.paul.martinez@gmail.com> Date: Sun Apr 7 10:17:41 2013 -0400 Updates to sun.dm and solar.dm Improved solar manual tracking by switching sun.dm and solar.dm to run off of the same clock (world.time) and added several options to the solar generator control computer. commit830f08f31aAuthor: RavingManiac <heisen51@gmail.com> Date: Sun Apr 7 13:38:40 2013 +0800 Space piano added to the bar. commit1878727417Author: RavingManiac <heisen51@gmail.com> Date: Sat Apr 6 21:11:59 2013 +0800 Nuke outpost altered to have a functional meeting room. Nuke operatives spawn in outpost barracks. Out-of-place tiles in research outpost replaced. commitd8e2857013Merge:506d9444293e30Author: RavingManiac <heisen51@gmail.com> Date: Sat Apr 6 19:09:21 2013 +0800 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze commit4293e30fe4Merge:9574aed664ea3eAuthor: Chinsky <krauchinsky@gmail.com> Date: Fri Apr 5 21:30:01 2013 -0700 Merge pull request #2628 from caelaislinn/bleeding-edge-freeze Added two-way smart cycling airlocks commit664ea3efa7Author: Cael_Aislinn <cael_aislinn@yahoo.com.au> Date: Fri Apr 5 16:12:31 2013 +1000 added two-way smart cycling airlocks Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au> commit506d944f30Author: RavingManiac <heisen51@gmail.com> Date: Fri Apr 5 03:11:52 2013 +0800 Nuke operatives now spawn in the outpost next to the syndicate shuttle. Outpost window widened a bit. Syndicate shuttle shutters are open at round start. Glass door to the lobby added to the medbay reception desk. commit9574aedab1Merge:ff0b83ef3e1ff5Author: Chinsky <krauchinsky@gmail.com> Date: Thu Apr 4 01:33:53 2013 -0700 Merge pull request #2620 from Asanadas/master Master into BEF commitd58ef35b6fAuthor: Chinsky <krauchinsky@gmail.com> Date: Sun Mar 17 04:41:42 2013 +0400 Made vote play alarm sound when started. commitbc69115b8fMerge:76ecf640f6475cAuthor: Chinsky <krauchinsky@gmail.com> Date: Sat Mar 16 21:13:49 2013 +0400 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze commit76ecf647d7Merge:bf68f8314a96f7Author: Chinsky <krauchinsky@gmail.com> Date: Sat Mar 16 21:06:57 2013 +0400 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze commitbf68f83546Author: Chinsky <krauchinsky@gmail.com> Date: Fri Mar 15 00:32:27 2013 +0400 Fixed brain surgery datum having duplicate class name. Made brain surgery into two steps, hemostat-fixovein. commit1486e4b487Merge:ced42944c7f1f2Author: Chinsky <krauchinsky@gmail.com> Date: Thu Mar 14 05:06:55 2013 +0400 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into HTML commitced4294be8Merge:e34d03316644b0Author: Chinsky <krauchinsky@gmail.com> Date: Fri Mar 8 03:26:41 2013 +0400 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into HTML commite34d033cc9Author: Chinsky <krauchinsky@gmail.com> Date: Tue Feb 12 20:43:22 2013 +0400 Moved tag whitelist check to HELPERS. Removed img tag from whitelist. commitfea160d6f0Merge:c175833fb25d2fAuthor: Chinsky <krauchinsky@gmail.com> Date: Tue Feb 12 19:39:00 2013 +0400 Merge branch 'master' into HTML commitc175833b9cAuthor: Chinsky <krauchinsky@gmail.com> Date: Tue Jan 15 07:17:21 2013 +0400 Started working on making paper use HTML instead of only BBCode again. Whitelisting system for tags. Blacklist for words like 'java' and names of even triggers. Might move to whitelist for those too, on Mini's suggestion.
367 lines
29 KiB
Plaintext
367 lines
29 KiB
Plaintext
/*
|
|
* Paper
|
|
* also scraps of paper
|
|
*/
|
|
|
|
/obj/item/weapon/paper
|
|
name = "paper"
|
|
gender = PLURAL
|
|
icon = 'icons/obj/bureaucracy.dmi'
|
|
icon_state = "paper"
|
|
throwforce = 0
|
|
w_class = 1.0
|
|
throw_range = 1
|
|
throw_speed = 1
|
|
layer = 4
|
|
pressure_resistance = 1
|
|
slot_flags = SLOT_HEAD
|
|
body_parts_covered = HEAD
|
|
attack_verb = list("")
|
|
|
|
var/info //What's actually written on the paper.
|
|
var/info_links //A different version of the paper which includes html links at fields and EOF
|
|
var/stamps //The (text for the) stamps on the paper.
|
|
var/fields //Amount of user created fields
|
|
var/list/stamped
|
|
var/rigged = 0
|
|
var/spam_flag = 0
|
|
|
|
var/const/deffont = "Verdana"
|
|
var/const/signfont = "Times New Roman"
|
|
var/const/crayonfont = "Comic Sans MS"
|
|
|
|
//lipstick wiping is in code/game/objects/items/weapons/cosmetics.dm!
|
|
|
|
/obj/item/weapon/paper/New()
|
|
..()
|
|
pixel_y = rand(-8, 8)
|
|
pixel_x = rand(-9, 9)
|
|
spawn(2)
|
|
update_icon()
|
|
updateinfolinks()
|
|
return
|
|
|
|
/obj/item/weapon/paper/update_icon()
|
|
if(info)
|
|
icon_state = "paper_words"
|
|
return
|
|
icon_state = "paper"
|
|
|
|
/obj/item/weapon/paper/examine()
|
|
set src in oview(1)
|
|
|
|
// ..() //We don't want them to see the dumb "this is a paper" thing every time.
|
|
// I didn't like the idea that people can read tiny pieces of paper from across the room.
|
|
// Now you need to be next to the paper in order to read it.
|
|
if(in_range(usr, src))
|
|
if(!(istype(usr, /mob/living/carbon/human) || istype(usr, /mob/dead/observer) || istype(usr, /mob/living/silicon)))
|
|
usr << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[stars(info)][stamps]</BODY></HTML>", "window=[name]")
|
|
onclose(usr, "[name]")
|
|
else
|
|
usr << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[info][stamps]</BODY></HTML>", "window=[name]")
|
|
onclose(usr, "[name]")
|
|
else
|
|
usr << "<span class='notice'>It is too far away.</span>"
|
|
return
|
|
|
|
/obj/item/weapon/paper/verb/rename()
|
|
set name = "Rename paper"
|
|
set category = "Object"
|
|
set src in usr
|
|
|
|
if((CLUMSY in usr.mutations) && prob(50))
|
|
usr << "<span class='warning'>You cut yourself on the paper.</span>"
|
|
return
|
|
var/n_name = copytext(sanitize(input(usr, "What would you like to label the paper?", "Paper Labelling", null) as text), 1, MAX_NAME_LEN)
|
|
if((loc == usr && usr.stat == 0))
|
|
name = "paper[(n_name ? text("- '[n_name]'") : null)]"
|
|
add_fingerprint(usr)
|
|
return
|
|
|
|
/obj/item/weapon/paper/attack_self(mob/living/user as mob)
|
|
examine()
|
|
if(rigged && (Holiday == "April Fool's Day"))
|
|
if(spam_flag == 0)
|
|
spam_flag = 1
|
|
playsound(loc, 'sound/items/bikehorn.ogg', 50, 1)
|
|
spawn(20)
|
|
spam_flag = 0
|
|
return
|
|
|
|
/obj/item/weapon/paper/attack_ai(var/mob/living/silicon/ai/user as mob)
|
|
var/dist
|
|
if(istype(user) && user.current) //is AI
|
|
dist = get_dist(src, user.current)
|
|
else //cyborg or AI not seeing through a camera
|
|
dist = get_dist(src, user)
|
|
if(dist < 2)
|
|
usr << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[info][stamps]</BODY></HTML>", "window=[name]")
|
|
onclose(usr, "[name]")
|
|
else
|
|
usr << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[stars(info)][stamps]</BODY></HTML>", "window=[name]")
|
|
onclose(usr, "[name]")
|
|
return
|
|
|
|
/obj/item/weapon/paper/proc/addtofield(var/id, var/text, var/links = 0)
|
|
var/locid = 0
|
|
var/laststart = 1
|
|
var/textindex = 1
|
|
while(1) // I know this can cause infinite loops and fuck up the whole server, but the if(istart==0) should be safe as fuck
|
|
var/istart = 0
|
|
if(links)
|
|
istart = findtext(info_links, "<span class=\"paper_field\">", laststart)
|
|
else
|
|
istart = findtext(info, "<span class=\"paper_field\">", laststart)
|
|
|
|
if(istart==0)
|
|
return // No field found with matching id
|
|
|
|
laststart = istart+1
|
|
locid++
|
|
if(locid == id)
|
|
var/iend = 1
|
|
if(links)
|
|
iend = findtext(info_links, "</span>", istart)
|
|
else
|
|
iend = findtext(info, "</span>", istart)
|
|
|
|
//textindex = istart+26
|
|
textindex = iend
|
|
break
|
|
|
|
if(links)
|
|
var/before = copytext(info_links, 1, textindex)
|
|
var/after = copytext(info_links, textindex)
|
|
info_links = before + text + after
|
|
else
|
|
var/before = copytext(info, 1, textindex)
|
|
var/after = copytext(info, textindex)
|
|
info = before + text + after
|
|
updateinfolinks()
|
|
|
|
/obj/item/weapon/paper/proc/updateinfolinks()
|
|
info_links = info
|
|
var/i = 0
|
|
for(i=1,i<=fields,i++)
|
|
addtofield(i, "<font face=\"[deffont]\"><A href='?src=\ref[src];write=[i]'>write</A></font>", 1)
|
|
info_links = info_links + "<font face=\"[deffont]\"><A href='?src=\ref[src];write=end'>write</A></font>"
|
|
|
|
|
|
/obj/item/weapon/paper/proc/clearpaper()
|
|
info = null
|
|
stamps = null
|
|
stamped = list()
|
|
overlays.Cut()
|
|
updateinfolinks()
|
|
update_icon()
|
|
|
|
|
|
/obj/item/weapon/paper/proc/parsepencode(var/t, var/obj/item/weapon/pen/P, mob/user as mob, var/iscrayon = 0)
|
|
// t = copytext(sanitize(t),1,MAX_MESSAGE_LEN)
|
|
|
|
t = replacetext(t, "\[center\]", "<center>")
|
|
t = replacetext(t, "\[/center\]", "</center>")
|
|
t = replacetext(t, "\[br\]", "<BR>")
|
|
t = replacetext(t, "\[b\]", "<B>")
|
|
t = replacetext(t, "\[/b\]", "</B>")
|
|
t = replacetext(t, "\[i\]", "<I>")
|
|
t = replacetext(t, "\[/i\]", "</I>")
|
|
t = replacetext(t, "\[u\]", "<U>")
|
|
t = replacetext(t, "\[/u\]", "</U>")
|
|
t = replacetext(t, "\[large\]", "<font size=\"4\">")
|
|
t = replacetext(t, "\[/large\]", "</font>")
|
|
t = replacetext(t, "\[sign\]", "<font face=\"[signfont]\"><i>[user.real_name]</i></font>")
|
|
t = replacetext(t, "\[field\]", "<span class=\"paper_field\"></span>")
|
|
|
|
if(!iscrayon)
|
|
t = replacetext(t, "\[*\]", "<li>")
|
|
t = replacetext(t, "\[hr\]", "<HR>")
|
|
t = replacetext(t, "\[small\]", "<font size = \"1\">")
|
|
t = replacetext(t, "\[/small\]", "</font>")
|
|
t = replacetext(t, "\[list\]", "<ul>")
|
|
t = replacetext(t, "\[/list\]", "</ul>")
|
|
|
|
t = "<font face=\"[deffont]\" color=[P.colour]>[t]</font>"
|
|
else // If it is a crayon, and he still tries to use these, make them empty!
|
|
t = replacetext(t, "\[*\]", "")
|
|
t = replacetext(t, "\[hr\]", "")
|
|
t = replacetext(t, "\[small\]", "")
|
|
t = replacetext(t, "\[/small\]", "")
|
|
t = replacetext(t, "\[list\]", "")
|
|
t = replacetext(t, "\[/list\]", "")
|
|
|
|
t = "<font face=\"[crayonfont]\" color=[P.colour]><b>[t]</b></font>"
|
|
|
|
// t = replacetext(t, "#", "") // Junk converted to nothing!
|
|
|
|
//Count the fields
|
|
var/laststart = 1
|
|
while(1)
|
|
var/i = findtext(t, "<span class=\"paper_field\">", laststart)
|
|
if(i==0)
|
|
break
|
|
laststart = i+1
|
|
fields++
|
|
|
|
return t
|
|
|
|
|
|
/obj/item/weapon/paper/proc/openhelp(mob/user as mob)
|
|
user << browse({"<HTML><HEAD><TITLE>Pen Help</TITLE></HEAD>
|
|
<BODY>
|
|
<b><center>Crayon&Pen commands</center></b><br>
|
|
<br>
|
|
\[br\] : Creates a linebreak.<br>
|
|
\[center\] - \[/center\] : Centers the text.<br>
|
|
\[b\] - \[/b\] : Makes the text <b>bold</b>.<br>
|
|
\[i\] - \[/i\] : Makes the text <i>italic</i>.<br>
|
|
\[u\] - \[/u\] : Makes the text <u>underlined</u>.<br>
|
|
\[large\] - \[/large\] : Increases the <font size = \"4\">size</font> of the text.<br>
|
|
\[sign\] : Inserts a signature of your name in a foolproof way.<br>
|
|
\[field\] : Inserts an invisible field which lets you start type from there. Useful for forms.<br>
|
|
<br>
|
|
<b><center>Pen exclusive commands</center></b><br>
|
|
\[small\] - \[/small\] : Decreases the <font size = \"1\">size</font> of the text.<br>
|
|
\[list\] - \[/list\] : A list.<br>
|
|
\[*\] : A dot used for lists.<br>
|
|
\[hr\] : Adds a horizontal rule.
|
|
</BODY></HTML>"}, "window=paper_help")
|
|
|
|
|
|
/obj/item/weapon/paper/Topic(href, href_list)
|
|
..()
|
|
if(!usr || (usr.stat || usr.restrained()))
|
|
return
|
|
|
|
if(href_list["write"])
|
|
var/id = href_list["write"]
|
|
//var/t = strip_html_simple(input(usr, "What text do you wish to add to " + (id=="end" ? "the end of the paper" : "field "+id) + "?", "[name]", null),8192) as message
|
|
//var/t = strip_html_simple(input("Enter what you want to write:", "Write", null, null) as message, MAX_MESSAGE_LEN)
|
|
var/t = input("Enter what you want to write:", "Write", null, null) as message
|
|
var/obj/item/i = usr.get_active_hand() // Check to see if he still got that darn pen, also check if he's using a crayon or pen.
|
|
var/iscrayon = 0
|
|
if(!istype(i, /obj/item/weapon/pen))
|
|
if(!istype(i, /obj/item/toy/crayon))
|
|
return
|
|
iscrayon = 1
|
|
|
|
|
|
if((!in_range(src, usr) && loc != usr && !( istype(loc, /obj/item/weapon/clipboard) ) && loc.loc != usr && usr.get_active_hand() != i)) // Some check to see if he's allowed to write
|
|
return
|
|
|
|
t = checkhtml(t)
|
|
|
|
// check for exploits
|
|
for(var/bad in paper_blacklist)
|
|
if(findtext(t,bad))
|
|
usr << "\blue You think to yourself, \"Hm.. this is only paper...\""
|
|
log_admin("PAPER: [usr] ([usr.ckey]) tried to use forbidden word in [src]: [bad].")
|
|
message_admins("PAPER: [usr] ([usr.ckey]) tried to use forbidden word in [src]: [bad].")
|
|
return
|
|
|
|
t = replacetext(t, "\n", "<BR>")
|
|
t = parsepencode(t, i, usr, iscrayon) // Encode everything from pencode to html
|
|
|
|
if(id!="end")
|
|
addtofield(text2num(id), t) // He wants to edit a field, let him.
|
|
else
|
|
info += t // Oh, he wants to edit to the end of the file, let him.
|
|
updateinfolinks()
|
|
|
|
usr << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[info_links][stamps]</BODY></HTML>", "window=[name]") // Update the window
|
|
|
|
update_icon()
|
|
|
|
|
|
/obj/item/weapon/paper/attackby(obj/item/weapon/P as obj, mob/user as mob)
|
|
..()
|
|
var/clown = 0
|
|
if(user.mind && (user.mind.assigned_role == "Clown"))
|
|
clown = 1
|
|
|
|
if(istype(P, /obj/item/weapon/pen) || istype(P, /obj/item/toy/crayon))
|
|
if ( istype(P, /obj/item/weapon/pen/robopen) && P:mode == 2 )
|
|
P:RenamePaper(user,src)
|
|
else
|
|
user << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[info_links][stamps]</BODY></HTML>", "window=[name]")
|
|
//openhelp(user)
|
|
return
|
|
else if(istype(P, /obj/item/weapon/stamp))
|
|
if((!in_range(src, usr) && loc != user && !( istype(loc, /obj/item/weapon/clipboard) ) && loc.loc != user && user.get_active_hand() != P))
|
|
return
|
|
|
|
stamps += (stamps=="" ? "<HR>" : "<BR>") + "<i>This paper has been stamped with the [P.name].</i>"
|
|
|
|
var/image/stampoverlay = image('icons/obj/bureaucracy.dmi')
|
|
stampoverlay.pixel_x = rand(-2, 2)
|
|
stampoverlay.pixel_y = rand(-3, 2)
|
|
|
|
if(istype(P, /obj/item/weapon/stamp/clown))
|
|
if(!clown)
|
|
user << "<span class='notice'>You are totally unable to use the stamp. HONK!</span>"
|
|
return
|
|
|
|
stampoverlay.icon_state = "paper_[P.icon_state]"
|
|
|
|
if(!stamped)
|
|
stamped = new
|
|
stamped += P.type
|
|
overlays += stampoverlay
|
|
|
|
user << "<span class='notice'>You stamp the paper with your rubber stamp.</span>"
|
|
|
|
add_fingerprint(user)
|
|
return
|
|
|
|
/*
|
|
* Premade paper
|
|
*/
|
|
/obj/item/weapon/paper/Court
|
|
name = "paper- 'Judgement'"
|
|
info = "For crimes against the station, the offender is sentenced to:<BR>\n<BR>\n"
|
|
|
|
/obj/item/weapon/paper/Toxin
|
|
name = "paper- 'Chemical Information'"
|
|
info = "Known Onboard Toxins:<BR>\n\tGrade A Semi-Liquid Plasma:<BR>\n\t\tHighly poisonous. You cannot sustain concentrations above 15 units.<BR>\n\t\tA gas mask fails to filter plasma after 50 units.<BR>\n\t\tWill attempt to diffuse like a gas.<BR>\n\t\tFiltered by scrubbers.<BR>\n\t\tThere is a bottled version which is very different<BR>\n\t\t\tfrom the version found in canisters!<BR>\n<BR>\n\t\tWARNING: Highly Flammable. Keep away from heat sources<BR>\n\t\texcept in a enclosed fire area!<BR>\n\t\tWARNING: It is a crime to use this without authorization.<BR>\nKnown Onboard Anti-Toxin:<BR>\n\tAnti-Toxin Type 01P: Works against Grade A Plasma.<BR>\n\t\tBest if injected directly into bloodstream.<BR>\n\t\tA full injection is in every regular Med-Kit.<BR>\n\t\tSpecial toxin Kits hold around 7.<BR>\n<BR>\nKnown Onboard Chemicals (other):<BR>\n\tRejuvenation T#001:<BR>\n\t\tEven 1 unit injected directly into the bloodstream<BR>\n\t\t\twill cure paralysis and sleep toxins.<BR>\n\t\tIf administered to a dying patient it will prevent<BR>\n\t\t\tfurther damage for about units*3 seconds.<BR>\n\t\t\tit will not cure them or allow them to be cured.<BR>\n\t\tIt can be administeredd to a non-dying patient<BR>\n\t\t\tbut the chemicals disappear just as fast.<BR>\n\tSleep Toxin T#054:<BR>\n\t\t5 units wilkl induce precisely 1 minute of sleep.<BR>\n\t\t\tThe effect are cumulative.<BR>\n\t\tWARNING: It is a crime to use this without authorization"
|
|
|
|
/obj/item/weapon/paper/courtroom
|
|
name = "paper- 'A Crash Course in Legal SOP on SS13'"
|
|
info = "<B>Roles:</B><BR>\nThe Detective is basically the investigator and prosecutor.<BR>\nThe Staff Assistant can perform these functions with written authority from the Detective.<BR>\nThe Captain/HoP/Warden is ct as the judicial authority.<BR>\nThe Security Officers are responsible for executing warrants, security during trial, and prisoner transport.<BR>\n<BR>\n<B>Investigative Phase:</B><BR>\nAfter the crime has been committed the Detective's job is to gather evidence and try to ascertain not only who did it but what happened. He must take special care to catalogue everything and don't leave anything out. Write out all the evidence on paper. Make sure you take an appropriate number of fingerprints. IF he must ask someone questions he has permission to confront them. If the person refuses he can ask a judicial authority to write a subpoena for questioning. If again he fails to respond then that person is to be jailed as insubordinate and obstructing justice. Said person will be released after he cooperates.<BR>\n<BR>\nONCE the FT has a clear idea as to who the criminal is he is to write an arrest warrant on the piece of paper. IT MUST LIST THE CHARGES. The FT is to then go to the judicial authority and explain a small version of his case. If the case is moderately acceptable the authority should sign it. Security must then execute said warrant.<BR>\n<BR>\n<B>Pre-Pre-Trial Phase:</B><BR>\nNow a legal representative must be presented to the defendant if said defendant requests one. That person and the defendant are then to be given time to meet (in the jail IS ACCEPTABLE). The defendant and his lawyer are then to be given a copy of all the evidence that will be presented at trial (rewriting it all on paper is fine). THIS IS CALLED THE DISCOVERY PACK. With a few exceptions, THIS IS THE ONLY EVIDENCE BOTH SIDES MAY USE AT TRIAL. IF the prosecution will be seeking the death penalty it MUST be stated at this time. ALSO if the defense will be seeking not guilty by mental defect it must state this at this time to allow ample time for examination.<BR>\nNow at this time each side is to compile a list of witnesses. By default, the defendant is on both lists regardless of anything else. Also the defense and prosecution can compile more evidence beforehand BUT in order for it to be used the evidence MUST also be given to the other side.\nThe defense has time to compile motions against some evidence here.<BR>\n<B>Possible Motions:</B><BR>\n1. <U>Invalidate Evidence-</U> Something with the evidence is wrong and the evidence is to be thrown out. This includes irrelevance or corrupt security.<BR>\n2. <U>Free Movement-</U> Basically the defendant is to be kept uncuffed before and during the trial.<BR>\n3. <U>Subpoena Witness-</U> If the defense presents god reasons for needing a witness but said person fails to cooperate then a subpoena is issued.<BR>\n4. <U>Drop the Charges-</U> Not enough evidence is there for a trial so the charges are to be dropped. The FT CAN RETRY but the judicial authority must carefully reexamine the new evidence.<BR>\n5. <U>Declare Incompetent-</U> Basically the defendant is insane. Once this is granted a medical official is to examine the patient. If he is indeed insane he is to be placed under care of the medical staff until he is deemed competent to stand trial.<BR>\n<BR>\nALL SIDES MOVE TO A COURTROOM<BR>\n<B>Pre-Trial Hearings:</B><BR>\nA judicial authority and the 2 sides are to meet in the trial room. NO ONE ELSE BESIDES A SECURITY DETAIL IS TO BE PRESENT. The defense submits a plea. If the plea is guilty then proceed directly to sentencing phase. Now the sides each present their motions to the judicial authority. He rules on them. Each side can debate each motion. Then the judicial authority gets a list of crew members. He first gets a chance to look at them all and pick out acceptable and available jurors. Those jurors are then called over. Each side can ask a few questions and dismiss jurors they find too biased. HOWEVER before dismissal the judicial authority MUST agree to the reasoning.<BR>\n<BR>\n<B>The Trial:</B><BR>\nThe trial has three phases.<BR>\n1. <B>Opening Arguments</B>- Each side can give a short speech. They may not present ANY evidence.<BR>\n2. <B>Witness Calling/Evidence Presentation</B>- The prosecution goes first and is able to call the witnesses on his approved list in any order. He can recall them if necessary. During the questioning the lawyer may use the evidence in the questions to help prove a point. After every witness the other side has a chance to cross-examine. After both sides are done questioning a witness the prosecution can present another or recall one (even the EXACT same one again!). After prosecution is done the defense can call witnesses. After the initial cases are presented both sides are free to call witnesses on either list.<BR>\nFINALLY once both sides are done calling witnesses we move onto the next phase.<BR>\n3. <B>Closing Arguments</B>- Same as opening.<BR>\nThe jury then deliberates IN PRIVATE. THEY MUST ALL AGREE on a verdict. REMEMBER: They mix between some charges being guilty and others not guilty (IE if you supposedly killed someone with a gun and you unfortunately picked up a gun without authorization then you CAN be found not guilty of murder BUT guilty of possession of illegal weaponry.). Once they have agreed they present their verdict. If unable to reach a verdict and feel they will never they call a deadlocked jury and we restart at Pre-Trial phase with an entirely new set of jurors.<BR>\n<BR>\n<B>Sentencing Phase:</B><BR>\nIf the death penalty was sought (you MUST have gone through a trial for death penalty) then skip to the second part. <BR>\nI. Each side can present more evidence/witnesses in any order. There is NO ban on emotional aspects or anything. The prosecution is to submit a suggested penalty. After all the sides are done then the judicial authority is to give a sentence.<BR>\nII. The jury stays and does the same thing as I. Their sole job is to determine if the death penalty is applicable. If NOT then the judge selects a sentence.<BR>\n<BR>\nTADA you're done. Security then executes the sentence and adds the applicable convictions to the person's record.<BR>\n"
|
|
|
|
/obj/item/weapon/paper/hydroponics
|
|
name = "paper- 'Greetings from Billy Bob'"
|
|
info = "<B>Hey fellow botanist!</B><BR>\n<BR>\nI didn't trust the station folk so I left<BR>\na couple of weeks ago. But here's some<BR>\ninstructions on how to operate things here.<BR>\nYou can grow plants and each iteration they become<BR>\nstronger, more potent and have better yield, if you<BR>\nknow which ones to pick. Use your botanist's analyzer<BR>\nfor that. You can turn harvested plants into seeds<BR>\nat the seed extractor, and replant them for better stuff!<BR>\nSometimes if the weed level gets high in the tray<BR>\nmutations into different mushroom or weed species have<BR>\nbeen witnessed. On the rare occassion even weeds mutate!<BR>\n<BR>\nEither way, have fun!<BR>\n<BR>\nBest regards,<BR>\nBilly Bob Johnson.<BR>\n<BR>\nPS.<BR>\nHere's a few tips:<BR>\nIn nettles, potency = damage<BR>\nIn amanitas, potency = deadliness + side effect<BR>\nIn Liberty caps, potency = drug power + effect<BR>\nIn chilis, potency = heat<BR>\n<B>Nutrients keep mushrooms alive!</B><BR>\n<B>Water keeps weeds such as nettles alive!</B><BR>\n<B>All other plants need both.</B>"
|
|
|
|
/obj/item/weapon/paper/djstation
|
|
name = "paper - 'DJ Listening Outpost'"
|
|
info = "<B>Welcome new owner!</B><BR><BR>You have purchased the latest in listening equipment. The telecommunication setup we created is the best in listening to common and private radio fequencies. Here is a step by step guide to start listening in on those saucy radio channels:<br><ol><li>Equip yourself with a multi-tool</li><li>Use the multitool on each machine, that is the broadcaster, receiver and the relay.</li><li>Turn all the machines on, it has already been configured for you to listen on.</li></ol> Simple as that. Now to listen to the private channels, you'll have to configure the intercoms, located on the front desk. Here is a list of frequencies for you to listen on.<br><ul><li>145.7 - Common Channel</li><li>144.7 - Private AI Channel</li><li>135.9 - Security Channel</li><li>135.7 - Engineering Channel</li><li>135.5 - Medical Channel</li><li>135.3 - Command Channel</li><li>135.1 - Science Channel</li><li>134.9 - Mining Channel</li><li>134.7 - Cargo Channel</li>"
|
|
|
|
/obj/item/weapon/paper/flag
|
|
icon_state = "flag_neutral"
|
|
item_state = "paper"
|
|
anchored = 1.0
|
|
|
|
/obj/item/weapon/paper/jobs
|
|
name = "paper- 'Job Information'"
|
|
info = "Information on all formal jobs that can be assigned on Space Station 13 can be found on this document.<BR>\nThe data will be in the following form.<BR>\nGenerally lower ranking positions come first in this list.<BR>\n<BR>\n<B>Job Name</B> general access>lab access-engine access-systems access (atmosphere control)<BR>\n\tJob Description<BR>\nJob Duties (in no particular order)<BR>\nTips (where applicable)<BR>\n<BR>\n<B>Research Assistant</B> 1>1-0-0<BR>\n\tThis is probably the lowest level position. Anyone who enters the space station after the initial job\nassignment will automatically receive this position. Access with this is restricted. Head of Personnel should\nappropriate the correct level of assistance.<BR>\n1. Assist the researchers.<BR>\n2. Clean up the labs.<BR>\n3. Prepare materials.<BR>\n<BR>\n<B>Staff Assistant</B> 2>0-0-0<BR>\n\tThis position assists the security officer in his duties. The staff assisstants should primarily br\npatrolling the ship waiting until they are needed to maintain ship safety.\n(Addendum: Updated/Elevated Security Protocols admit issuing of low level weapons to security personnel)<BR>\n1. Patrol ship/Guard key areas<BR>\n2. Assist security officer<BR>\n3. Perform other security duties.<BR>\n<BR>\n<B>Technical Assistant</B> 1>0-0-1<BR>\n\tThis is yet another low level position. The technical assistant helps the engineer and the statian\ntechnician with the upkeep and maintenance of the station. This job is very important because it usually\ngets to be a heavy workload on station technician and these helpers will alleviate that.<BR>\n1. Assist Station technician and Engineers.<BR>\n2. Perform general maintenance of station.<BR>\n3. Prepare materials.<BR>\n<BR>\n<B>Medical Assistant</B> 1>1-0-0<BR>\n\tThis is the fourth position yet it is slightly less common. This position doesn't have much power\noutside of the med bay. Consider this position like a nurse who helps to upkeep medical records and the\nmaterials (filling syringes and checking vitals)<BR>\n1. Assist the medical personnel.<BR>\n2. Update medical files.<BR>\n3. Prepare materials for medical operations.<BR>\n<BR>\n<B>Research Technician</B> 2>3-0-0<BR>\n\tThis job is primarily a step up from research assistant. These people generally do not get their own lab\nbut are more hands on in the experimentation process. At this level they are permitted to work as consultants to\nthe others formally.<BR>\n1. Inform superiors of research.<BR>\n2. Perform research alongside of official researchers.<BR>\n<BR>\n<B>Detective</B> 3>2-0-0<BR>\n\tThis job is in most cases slightly boring at best. Their sole duty is to\nperform investigations of crine scenes and analysis of the crime scene. This\nalleviates SOME of the burden from the security officer. This person's duty\nis to draw conclusions as to what happened and testify in court. Said person\nalso should stroe the evidence ly.<BR>\n1. Perform crime-scene investigations/draw conclusions.<BR>\n2. Store and catalogue evidence properly.<BR>\n3. Testify to superiors/inquieries on findings.<BR>\n<BR>\n<B>Station Technician</B> 2>0-2-3<BR>\n\tPeople assigned to this position must work to make sure all the systems aboard Space Station 13 are operable.\nThey should primarily work in the computer lab and repairing faulty equipment. They should work with the\natmospheric technician.<BR>\n1. Maintain SS13 systems.<BR>\n2. Repair equipment.<BR>\n<BR>\n<B>Atmospheric Technician</B> 3>0-0-4<BR>\n\tThese people should primarily work in the atmospheric control center and lab. They have the very important\njob of maintaining the delicate atmosphere on SS13.<BR>\n1. Maintain atmosphere on SS13<BR>\n2. Research atmospheres on the space station. (safely please!)<BR>\n<BR>\n<B>Engineer</B> 2>1-3-0<BR>\n\tPeople working as this should generally have detailed knowledge as to how the propulsion systems on SS13\nwork. They are one of the few classes that have unrestricted access to the engine area.<BR>\n1. Upkeep the engine.<BR>\n2. Prevent fires in the engine.<BR>\n3. Maintain a safe orbit.<BR>\n<BR>\n<B>Medical Researcher</B> 2>5-0-0<BR>\n\tThis position may need a little clarification. Their duty is to make sure that all experiments are safe and\nto conduct experiments that may help to improve the station. They will be generally idle until a new laboratory\nis constructed.<BR>\n1. Make sure the station is kept safe.<BR>\n2. Research medical properties of materials studied of Space Station 13.<BR>\n<BR>\n<B>Scientist</B> 2>5-0-0<BR>\n\tThese people study the properties, particularly the toxic properties, of materials handled on SS13.\nTechnically they can also be called Plasma Technicians as plasma is the material they routinly handle.<BR>\n1. Research plasma<BR>\n2. Make sure all plasma is properly handled.<BR>\n<BR>\n<B>Medical Doctor (Officer)</B> 2>0-0-0<BR>\n\tPeople working this job should primarily stay in the medical area. They should make sure everyone goes to\nthe medical bay for treatment and examination. Also they should make sure that medical supplies are kept in\norder.<BR>\n1. Heal wounded people.<BR>\n2. Perform examinations of all personnel.<BR>\n3. Moniter usage of medical equipment.<BR>\n<BR>\n<B>Security Officer</B> 3>0-0-0<BR>\n\tThese people should attempt to keep the peace inside the station and make sure the station is kept safe. One\nside duty is to assist in repairing the station. They also work like general maintenance personnel. They are not\ngiven a weapon and must use their own resources.<BR>\n(Addendum: Updated/Elevated Security Protocols admit issuing of weapons to security personnel)<BR>\n1. Maintain order.<BR>\n2. Assist others.<BR>\n3. Repair structural problems.<BR>\n<BR>\n<B>Head of Security</B> 4>5-2-2<BR>\n\tPeople assigned as Head of Security should issue orders to the security staff. They should\nalso carefully moderate the usage of all security equipment. All security matters should be reported to this person.<BR>\n1. Oversee security.<BR>\n2. Assign patrol duties.<BR>\n3. Protect the station and staff.<BR>\n<BR>\n<B>Head of Personnel</B> 4>4-2-2<BR>\n\tPeople assigned as head of personnel will find themselves moderating all actions done by personnel. \nAlso they have the ability to assign jobs and access levels.<BR>\n1. Assign duties.<BR>\n2. Moderate personnel.<BR>\n3. Moderate research. <BR>\n<BR>\n<B>Captain</B> 5>5-5-5 (unrestricted station wide access)<BR>\n\tThis is the highest position youi can aquire on Space Station 13. They are allowed anywhere inside the\nspace station and therefore should protect their ID card. They also have the ability to assign positions\nand access levels. They should not abuse their power.<BR>\n1. Assign all positions on SS13<BR>\n2. Inspect the station for any problems.<BR>\n3. Perform administrative duties.<BR>\n"
|
|
|
|
/obj/item/weapon/paper/photograph
|
|
name = "photo"
|
|
icon_state = "photo"
|
|
var/photo_id = 0.0
|
|
item_state = "paper"
|
|
|
|
/obj/item/weapon/paper/sop
|
|
name = "paper- 'Standard Operating Procedure'"
|
|
info = "Alert Levels:<BR>\nBlue- Emergency<BR>\n\t1. Caused by fire<BR>\n\t2. Caused by manual interaction<BR>\n\tAction:<BR>\n\t\tClose all fire doors. These can only be opened by reseting the alarm<BR>\nRed- Ejection/Self Destruct<BR>\n\t1. Caused by module operating computer.<BR>\n\tAction:<BR>\n\t\tAfter the specified time the module will eject completely.<BR>\n<BR>\nEngine Maintenance Instructions:<BR>\n\tShut off ignition systems:<BR>\n\tActivate internal power<BR>\n\tActivate orbital balance matrix<BR>\n\tRemove volatile liquids from area<BR>\n\tWear a fire suit<BR>\n<BR>\n\tAfter<BR>\n\t\tDecontaminate<BR>\n\t\tVisit medical examiner<BR>\n<BR>\nToxin Laboratory Procedure:<BR>\n\tWear a gas mask regardless<BR>\n\tGet an oxygen tank.<BR>\n\tActivate internal atmosphere<BR>\n<BR>\n\tAfter<BR>\n\t\tDecontaminate<BR>\n\t\tVisit medical examiner<BR>\n<BR>\nDisaster Procedure:<BR>\n\tFire:<BR>\n\t\tActivate sector fire alarm.<BR>\n\t\tMove to a safe area.<BR>\n\t\tGet a fire suit<BR>\n\t\tAfter:<BR>\n\t\t\tAssess Damage<BR>\n\t\t\tRepair damages<BR>\n\t\t\tIf needed, Evacuate<BR>\n\tMeteor Shower:<BR>\n\t\tActivate fire alarm<BR>\n\t\tMove to the back of ship<BR>\n\t\tAfter<BR>\n\t\t\tRepair damage<BR>\n\t\t\tIf needed, Evacuate<BR>\n\tAccidental Reentry:<BR>\n\t\tActivate fire alrms in front of ship.<BR>\n\t\tMove volatile matter to a fire proof area!<BR>\n\t\tGet a fire suit.<BR>\n\t\tStay secure until an emergency ship arrives.<BR>\n<BR>\n\t\tIf ship does not arrive-<BR>\n\t\t\tEvacuate to a nearby safe area!"
|
|
|
|
/obj/item/weapon/paper/crumpled
|
|
name = "paper scrap"
|
|
icon_state = "scrap"
|
|
|
|
/obj/item/weapon/paper/crumpled/update_icon()
|
|
return
|
|
|
|
/obj/item/weapon/paper/crumpled/bloody
|
|
icon_state = "scrap_bloodied"
|