Commit Graph

9304 Commits

Author SHA1 Message Date
Tastyfish 4fcda439a7 doing a custom vote, aborting it, and starting a new one appended the choices to the choices of the old one. 2012-02-02 04:38:55 -05:00
SkyMarshal 3087c5d2e6 Hallucinations are 50x creepier now, thanks Mr. Fox. 2012-02-02 01:13:49 -07:00
SkyMarshal 2ed57e0cc6 Finished up the last parts of my fingerprints work. Added a rag which lets you smudge away prints, and sinks do the same.
Added hallucinations properly.
Added LSD (with hallucinations.)
Remapped slightly.
2012-02-02 00:35:48 -07:00
SkyMarshal 1b02334ddc Syndicate Sleeper updates. 2012-02-02 00:35:47 -07:00
Albert Iordache 43d1d5aaab Merge branch 'master' of https://github.com/Hawk-v3/Baystation12 into Hawk-v3-master
Conflicts:
	code/modules/power/apc.dm
2012-02-02 08:50:33 +02:00
Tastyfish 98bebf0460 Merge remote-tracking branch 'upstream/master' 2012-02-01 19:15:23 -05:00
Tastyfish 5f3a6455f9 photos, pages in books, binder much better, books show author ckey 2012-02-01 19:14:30 -05:00
trubblebass@gmail.com b33f03265f - Fixed it so you can't place plasma tanks on your back.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3027 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-01 20:50:33 +00:00
polyxenitopalidou@gmail.com e1287c75a2 •Huh. I thought I had commited these.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3026 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-01 13:50:36 +00:00
CaelAislinn 1455b55eb8 added new circuitboard
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-01 21:01:42 +10:00
CaelAislinn 8eb550f794 Merge branch 'master' of git://github.com/Baystation12/Baystation12
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-01 18:18:04 +10:00
CaelAislinn 9366781cef security camera circuits and outpost camera circuits are no longer researchable. new research item: camera monitor circuits. can be set to produce monitoring computer for any hardcoded camera network, with appropriate approval levels (sec for station, mining for outpost etc).
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-01 18:00:55 +10:00
CompactNinja 70b4a326f7 Merge pull request #339 from SkyMarshal/master
Runtimes fixes, fingerprints fixes, new unimplemented traitor objective, surgery bugfixes, sanity checking.
2012-01-31 21:02:18 -08:00
SkyMarshal 41749df402 Missed some stuff. 2012-01-31 21:36:22 -07:00
SkyMarshal e7a7b8017d Fix for fingerprints. (They work right, now!)
Fixed the runtime related to brainmobs (sanity check)
do_after now works right.
Added the Decapitate objective, that is admin only ATM, which requires you remove their head and take it on the escape shuttle.
Fixes for a lot of surgery related bugs
Added a prompt to AI players when they are greeted, warning them not to stalk the traitor and so on.  Cacophony and Spaceman approved of it.
Sanity check for limb removal and blood stuff.
Added in sprites for a Syndicate statis/sleeper for a secret thing I have planned!
2012-01-31 21:23:37 -07:00
only.lurking@gmail.com e46938f7a8 Sleepers notify the occupant when they get placed inside (much like getting put into Cryo works.) You're welcome, Lasty.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3025 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-01 03:47:49 +00:00
SkyMarshal 18a7fc25c9 Merge pull request #338 from SkyMarshal/master
Bugfixes
2012-01-31 16:58:57 -08:00
SkyMarshal 6e3aef823a Fix for wardrobes and lockers.
Fix for Fingerprints.
2012-01-31 17:58:22 -07:00
trubblebass@gmail.com 2f46c7aa4f Herp-de-derp Missed a file off the last commit.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3023 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-31 23:16:12 +00:00
trubblebass@gmail.com cb7123d122 Fixes courtesy of BubbbleWrap
- The first makes it so floor tiles are actually used up when placed on lattice.
- The second fixes the pepperspray so it isn't blocked by cigarettes/cigars/etc...

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3022 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-31 22:54:04 +00:00
SkyMarshal f89009e6ab Merge pull request #337 from SkyMarshal/master
Bugfixes
2012-01-31 14:04:29 -08:00
SkyMarshal 80be80a4c1 Bugfixes!
Fingerprint sanity checks
Mulebot sanity checks
Traitor objectives work, now
Some mapping errors fixed.
Attempted fix for solar tracking.
2012-01-31 15:00:46 -07:00
Albert Iordache 5c8f42a2d6 Fixed an operating computer runtime error 2012-01-31 20:20:41 +02:00
elly1989@rocketmail.com 2d77383ad0 Widespread grammar fixes! Still loads I've yet to fix. It'll take forever.
Resolved Issue 333: The plastic flaps on the mining station now actually block air-flow. http://code.google.com/p/tgstation13/issues/detail?id=333
Fix for runtime in issue 332 until getrev is fixed. https://code.google.com/p/tgstation13/issues/detail?id=332
Resolved Issue 331 https://code.google.com/p/tgstation13/issues/detail?id=331
Resolved Issue 304 https://code.google.com/p/tgstation13/issues/detail?id=304
Removed a lever I found randomly placed within the asteroid rock.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3021 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-31 10:03:55 +00:00
SkyMarshal 39f170b4b3 Final updates:
Fingerprints done.
A mob's be_syndicate is a direct copy of their preferences.
2012-01-31 02:30:54 -07:00
SkyMarshal beffc2299a Final updates on Fingerprints
fix for traitors getting assassinate and protect targets for the same person
Ported blood rejection
2012-01-31 02:01:39 -07:00
SkyMarshal 6648061dcb MAJOR UPDATE: Detective/Fingerprints update
bugfix for wardrobes
blood type is now handled by datum/dna, and blood_DNA for atoms is a list of list, each sub list containing DNA and blood-type. (This allows multiple blood splatters)
added BS12 give command and explosives
Map update to remove blob spawn.
2012-01-31 02:01:38 -07:00
SkyMarshal 5dba3ccf88 WIP on detective work overhaul
Give command ported, with more sanity checks (It works, now!)
Added BS12 c4 in addition to TG c4
Fixed server air alarm
Book length increased 3 fold.
Blood and gibs now maintains DNA
Fixed evidence bags
Ported the awesome BS12 handcuff stuff, with flavor text.
2012-01-31 02:01:37 -07:00
SkyMarshal d2eff85c17 Porting much of Aryn's stuff
-Sounds
-Detective Work
-Hallucinations
Tweaked server air alarm
Tweaked gibs
Working on de-derping surgery
Ported some BS12 stuff (stunned radio and adminwho)
Player's mind datum now holds their antagonist preferences.
2012-01-31 02:01:36 -07:00
quartz235@gmail.com 2f1b019396 TG Update: Fix for issue 246
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2705 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-30 18:03:57 +00:00
polyxenitopalidou@gmail.com fa4a015140 •Final fix :3
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3020 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-30 17:17:50 +00:00
polyxenitopalidou@gmail.com 5d4440dcae •Because "HURR DURR BREAK NEWSCSATER" becomes silly after the nth round.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3018 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-30 17:06:51 +00:00
Superxpdude@gmail.com 298932e028 Committing Carn's patch from here: http://bit.ly/ww7gmD
Game Admins and Game Masters can now toggle random events from happening during a round, it is also an option in the config file.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3017 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-30 15:54:16 +00:00
polyxenitopalidou@gmail.com 6b77009789 •Who's dumb? I'm dumb.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3016 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-30 14:59:43 +00:00
CaelAislinn 7c46d4ff63 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-01-30 22:25:07 +10:00
ryantennessee@yahoo.com ef93358b40 TG Update: Quarxink fixing invisible fried eggs and fixing an earlier derp with supplyshuttle.dm
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2701 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-30 09:32:47 +00:00
ryantennessee@yahoo.com 8484107225 TG Update: Quarxink update flip mode eyewitness news - Stopped an exploit to get to centcom (for justice) - Added 5 second cooldown to printing requisition to stop spam (also for justice) - Atmos pipes are now backpackable and do damage because they're FUCKING PIPES (not really for justice but just a pet peeve)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2700 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-30 08:52:00 +00:00
baloh.matevz a2de8cda21 TG Update: Possessing stuff now sends admin messages.
Possessing and then releasing something restores your original name. Works even if you possess several things one after another as well as if you release an object without having possessed it in the first place.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2699 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-30 08:48:07 +00:00
Hawk-v3 02da71b38d TG update: latest meteor bugfixes. Replaced BS12 bugfixes. 2012-01-30 08:14:06 +00:00
polyxenitopalidou@gmail.com 7c4a9c4891 •Quick bugfix on newspapers and changelog update, once again. This should be it.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3013 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-29 23:22:11 +00:00
CIB c6af564979 Merge pull request #329 from SkyMarshal/master
Removes odd (and buggy) Z-levels 7-12 that are randomly generated on Sandbox and Extended.  I put 10 dollars that this was goon code.
2012-01-29 13:11:40 -08:00
only.lurking@gmail.com fd268e7b18 More SQL injection patches. Added a standardized method of SQL sanitization [sanitizeSQL()].
Corrected a href list vulnerability that let players spawn Arcane Tomes from non-e-magged library computers.
Tweaked and disabled forum_activation.dm. Way too many SQL vulnerabilities to justify keeping it around.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3012 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-29 20:56:05 +00:00
trubblebass@gmail.com 919d0e7217 - Pepper spray is back, and now can only be filled from the pepper-spray dispensers.
- Readded the pepper-spray dispensers to the Armoury and to Sec.
- Readded the pepper-spray to Sec Lockers.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3011 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-29 20:44:16 +00:00
polyxenitopalidou@gmail.com 3950fdc7c9 •Runtime error and several typos fix. Thanks, Pete.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3009 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-29 20:35:09 +00:00
CaelAislinn 8f7841941c forgot to add secure storage network to lockdown computer
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-01-30 04:57:07 +10:00
polyxenitopalidou@gmail.com 881e2e4787 •Newscasters are live. Functions described in changelog (which is going to be updated on my next commit, 2 minutes from now), and my code is easily readable so I'm sure that you guys will manage :3
•Bunch of normal newscasters placed around the station, 2 security newscasters -with the ability to censor anything- placed in Sec and the Bridge

•Icon and photo usability in Feed Stories removed (for now) due to pete threatening me with naked pictures of his in-game character.

•Sorry for every datum or obj declaration being in the same file, I will clean them up in a bit. Right now, it gives you all you need to know of the newscater's function.

•If you need clarification about anything at ANY part of the code, ask through a comment

•Total work put into this was 4-5 days in total. Will add more features in the future, and it's easy enough for anyone to do so.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3005 316c924e-a436-60f5-8080-3fe189b3f50e
2012-01-29 18:40:30 +00:00
CaelAislinn a2a82c620d Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-01-30 04:26:29 +10:00
CaelAislinn ed7aff55e0 added engine core + a bunch of engineering areas to Antiqua.dmm 2012-01-30 04:20:17 +10:00
SkyMarshal 4b1359e722 Removes odd (and buggy) Z-levels 7-12 that are randomly generated on Sandbox and Extended. I put 10 dollars that this was goon code. 2012-01-29 03:49:35 -07:00
SkyMarshal 4b79c258b6 Map update: Adds wardrobes for all jobs + copiers and filing cabinets.
Modified surgery to work with autopsy
Adminhelp should go to the admin channel without being stupid
suicide tweaked so all antags can use it
You can no longer radio while stunned
More door fixes.
2012-01-29 02:16:18 -07:00