Commit Graph

4121 Commits

Author SHA1 Message Date
Miniature
2a7336f61f Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	config/config.txt
2012-05-12 00:52:42 +09:30
Miniature
77987f76f5 Made banned people who aren't banned under the same key they are trying to log in as show what key they were banned as to admins
turned on the thing to show where to go to appeal
2012-05-12 00:48:17 +09:30
Miniature
e3772d4158 Made picking a camera through the camera list actually work, also a couple of comments 2012-05-11 23:59:02 +09:30
CIB
776a033252 Merge pull request #1020 from Hawk-v3/master
Trying to stop JSON -> WORLD dumps.
2012-05-11 01:42:03 -07:00
CIB
adda7a042d Merge pull request #1021 from Lexusjjss/genBranch
Created Industrial PACMAN generator with a Kirby sprite.
2012-05-11 01:41:23 -07:00
Lexus Langg
2ccf6e604a Created Industrial PACMAN generator with a Kirby sprite.
Made matching circuit board and R&D imprinter design.
My first real commit. =P

Signed-off-by: Lexus Langg <jaedonjacobi@yahoo.com>
2012-05-10 18:55:27 -07:00
Albert Iordache
43af079496 Merge pull request #1019 from Erthilo/master
Fixes a rogue period in Tajaran examine, also fixes various glasses not working on Tajaran.
2012-05-10 18:39:08 -07:00
Hawk-v3
5a24d138b5 Trying to stop JSON -> WORLD dumps 2012-05-11 01:09:10 +01:00
Erthilo
434434e8c1 Fixes a rogue period in Tajaran examine, also fixes various glasses not working on Tajaran. 2012-05-11 00:29:10 +01:00
SkyMarshal
83b69a94b9 Merge pull request #1017 from Hawk-v3/master
HAWKMAPS (GASP)
2012-05-10 15:28:13 -07:00
Hawk-v3
c57476fcc7 HAWKMAPS(Gasp)
Shared Breakroom for Atmos, Engineering and Robotics. It's a proper den and has, to ENVY OF STATION, comfy chairs. And a recharger for borgbros.

Added updated armoury page.
2012-05-10 23:26:44 +01:00
CIB
232a3bacf9 Merge pull request #1016 from Erthilo/master
Mask changes, TG updates, sprites fixes, and custom items
2012-05-10 13:52:25 -07:00
Erthilo
eeec0be2b2 Runtime prevention for timeofdeath thingy. 2012-05-10 21:45:45 +01:00
Erthilo
50f5837ac6 TG: •Contraband supply packs now contain the DreadoryCobullshit cigarettes.
Pete, read the comments, the contraband crate is supposed to be a random-
assortment-of-goodies pack, and will gradually add more contraband to it.
Revision: r3573
Author: 	 polyxenitopalidou
2012-05-10 21:03:16 +01:00
Erthilo
238eb9de78 TG: Fixed Summon Guns spawning broken eguns. Replaced the decloner and freezegun
with aegun and mateba (for list of possible guns).

Added Ausops gateway sprite.

Added placeholder structures so the people working on the map have something to
mark where the recieving gate will be.

And unfinished Behemoth code because the dme needed to be updated to include
Ausops stuff.
Revision: r3572
Author: 	 kortgstation
2012-05-10 21:00:57 +01:00
Erthilo
340a86bbcc Chemistry moved to purely CMO's domain. RD's chemistry access removed. Slightly tweak title screen so the flare doesn't go off the edge (trust me it looks better) 2012-05-10 20:56:53 +01:00
Erthilo
bf5386288e Toggle mask code by Gaben/Spamcat. Custom items for staghorn and atmoicdog29. Airlock electronic fixes for research doors. 2012-05-10 18:18:21 +01:00
CIB
20d00a44d2 Merge pull request #1014 from Erthilo/master
Custom items for madmalicemccrea, searif, serithi, thebreadbocks, themij. Changelog too!
2012-05-10 09:18:04 -07:00
Erthilo
1512331aa7 Fixed icons and removed a duplicate. 2012-05-10 17:10:35 +01:00
Erthilo
08191c824d Merge branch 'DetectiveWork' of https://github.com/SkyMarshal/Baystation12 into SkyMarshal-DetectiveWork
Notes:
Fucking hell. Makes the detective backend shit non-retarded. <3 Hashtables.
Map changes. Some improvements/adjustments to code to work with the map changes.

Conflicts:
	baystation12.dme
2012-05-10 16:48:01 +01:00
Albert Iordache
71eec72e40 Merge pull request #1000 from comma/master
Photo Rework
2012-05-10 08:38:43 -07:00
Erthilo
b25e3781cf Custom items for madmalicemccrea, searif, serithi, thebreadbocks, themij. Changelog too! 2012-05-10 16:38:38 +01:00
Erthilo
e81de2fe86 Fixes respawn not counting deathtime correctly for ghosts. 2012-05-10 15:53:08 +01:00
Erthilo
91a20e9811 Fixes a separate infinite loop error, as detailed here: https://github.com/ss13-daedalus/daedalus/issues/2
Credit to: @thvortex
2012-05-10 14:34:32 +01:00
unknown
cc770f80b7 Merge branch 'master' of git://github.com/Baystation12/Baystation12
Conflicts:
	icons/obj/items.dmi - Resolved
2012-05-10 15:53:38 +03:00
unknown
0b53e20d6b Fixed issues with new pohto system
Wall mounted things are displayed correctly now
No more x-ray cameras
Bonus: You can reanme photos, and write things on it with pen

Signed-off-by: unknown <comma@nanotras-da0607.(none)>
2012-05-10 15:17:45 +03:00
Albert Iordache
cdd50207aa Update to gameticker.dm, should fix the infinite loop problem. 2012-05-10 13:45:14 +03:00
Erthilo
8aae642d83 TG: Some fixes for topic calls and inputs.
There's like 1001 things to fix so some of this is somewhat crude for now.

new helper proc located in procs/helpers.dm
reject_bad_text(var/text)
just feed any text in and it will either return the original text or null (if it
contains odd characters such as \ / < > or characters reserved by BYOND. It also
rejects if there are no non-whitespace characters)
Revision: r3571
Author: 	 elly1...@rocketmail.com
2012-05-10 03:02:56 +01:00
Erthilo
3c9b734c2f TG: - Runtime fix for admins using the traitor panel before the round starts
Revision: r3570
Author: 	 johnsonmt88
2012-05-10 02:55:59 +01:00
Erthilo
9b334464df TG: Cooldown on book printing actually works and is simplified.
Revision: r3569
Author: 	 quartz235
2012-05-10 02:55:25 +01:00
Erthilo
5b52e2ce64 TG: -Emergency Toolboxes now contain smaller, lighter fire extinguishers that
actually fit inside them!
Revision: r3568
Author: 	 d_h2...@yahoo.com
2012-05-10 02:52:05 +01:00
Erthilo
b503045444 TG: -Uncomments the third file required to make the removed drinks work. Ugh.
Revision: r3567
Author: 	 d_h2...@yahoo.com
2012-05-10 02:48:11 +01:00
Erthilo
f484bdfb52 TG: Minor cigarette fixes, and added the DromedaryCo cigarette crate as a new
contraband crate.
Also added WJohnston's new rolled up poster sprite.
Revision: r3566
Author: 	 petethegoat
2012-05-10 02:47:23 +01:00
Erthilo
1b32449bf8 TG: Fixed issue 411 . (Thanks Yvarov-
http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=8651)
Added Invisty's new field generator sprites.

Added a button to check antagonists that stops the world from automatically
restarting at round end.
It's toggleable, but once the round ends with it on, you'll need to reboot the
world manually. (It's under check antagonists because that's where the shuttle
stuff is, let me know if I should move it.)
Revision: r3565
Author: 	 petethegoat
2012-05-10 02:42:23 +01:00
Erthilo
6edf5fa002 TG: -New booze sprites for the drinks that were removed. Re-enabled the recipes for
the removed drinks.
-Drinking the Antifreeze booze makes you warmer. Duh.
-You now need 10 sheets of metal instead of 2 to make a gas canister, people
can't FILL ENTIRE ROOMS WITH THEM.
2012-05-10 02:41:27 +01:00
Erthilo
275b0f4971 TG: Added Wjohnstons resin xeno doors.
Revision: r3560
Author: 	 kortgstation
2012-05-10 02:40:48 +01:00
Erthilo
b86f71dc71 TG: Adds the framework for randomlly loading an additional external z-level at
server start.  Loading during the game should also be possible.
Fixes assorted bugs
Revision: r3559
Author: 	 VivianFoxfoot
2012-05-10 02:12:12 +01:00
Erthilo
3435a47a7c TG: Added an ex_act for simple animals
Revision: r3558
Author: 	 kortgstation
2012-05-10 01:59:55 +01:00
Erthilo
a9a5e1ef3e TG: -Added fat jumpsuit sprites for orange, owl, pink, security, warden, and yellow
jumpsuits. Made the placeholder for suits that don't have a fat sprite a normal
grey jumpsuit instead of having the person naked with FAT SUIT written over
them.
-Tweaked the way the Somatoray works on trays. Hopefully this will make it more
useful and less buggy.
-Botanical leather gloves tweaked. Can now remove lights without getting you
burned, basically.
-Botanists given morgue access to better clone people via replicant pods.
Revision: r3557
Author: 	 d_h2...@yahoo.com
2012-05-10 01:58:28 +01:00
Erthilo
dfb960139c TG: Sanitize added to agent cards and ID computer.
Revision: r3556
Author: 	 johnsonmt88
2012-05-10 01:56:37 +01:00
Erthilo
98486c4bc0 TG: Nuke ops spawn with an engineers internals box (extended oxytank)
Revision: r3555
Author: 	 kortgstation
2012-05-10 01:55:41 +01:00
Erthilo
d5abd91800 TG: Fixes guns some. Can't shoot yourself as easily anymore. You can now aim at
body parts with your gun.  I think the reason you couldn't before was just the
failure to pass the def_zone up to the parent, not sure if that was intensional
or not.
Revision: r3554
Author: 	 VivianFoxfoot
2012-05-10 01:53:17 +01:00
Erthilo
3ea312f2d2 TG: AIs and Cyborgs can now understand PAIs and MMIs
Revision: r3553
Author: 	 kortgstation
2012-05-10 01:50:41 +01:00
Erthilo
ad95edc954 TG: Wraiths now have their own jaunt animation, courtesy of Ausops.
Revision: r3551
Author: 	 kortgstation
2012-05-10 01:49:04 +01:00
Erthilo
6631117ba9 TG: Added Ikarrus's latest map updates. Changes to genetics, medbay, research and
security.
Updated operating tables to search for adjacent computers, rather than using an
ID.
Switched back to the old bodybag sprites.
Slightly updated the Oddy destroyed sprites, and updated the changelog.
Revision: r3547
Author: 	 petethegoat
2012-05-10 01:42:22 +01:00
Erthilo
a3089f9017 TG: Changed the way facial scarring works. Instead of setting your real_name to
"Unknown" it uses the disfigured variable of a human's head organ to dictate the
human's name variable.

This means real_name is now somewhat back to being a reliable source of the
mob's actual name. It should eliminate a lot of the "cloning as unknown" bugs.

It also means I could simplify that god-awful name updating stuff into a nice
and simple helper proc.

Some original_name stuff was added here and there,  mainly during cloning. A lot
of the "getting random ghost names" should  be fixed now. Still loads to do
though, particularly with transforms and such. >_>

Fixed a runtime with Tajarans trying to use a variable that doesn't exist for
PDAs. Removed that variable from IDs as it's only used by furries.
Revision: r3546
Author: 	 elly1...@rocketmail.com
2012-05-10 00:53:05 +01:00
Erthilo
79758083fc TG: Updated DNA modifier consoles so they work in any direction.
Updated adminwho so the plebs can see ranks.
Removed the admin message from view range changes.
Revision: r3545
Author: 	 petethegoat
2012-05-10 00:20:01 +01:00
Erthilo
165b516949 TG: Fixes a pAI requests runtime caused by clients disconnecting.
Fixes a host of runtimes caused by lag delaying "transmissions" between
telecomms machines. Various objects were being deconstructed during this lagtime
resulting in a bunch of weird null errors. Tested for 24hours on another server.
Seems to be all ok.

Added some rudimentary checks to advanced proccall. Calling procs owned by
objects is now a little less prone to runtimes. still a bunch of stuff to do to
get it safe enough though.
Revision: r3542
Author: 	 elly1...@rocketmail.com

Ported over BS12's piano code. I say ported, it's not like it's anything but a
copy/paste though.
Also changed the icon to the minimoog, to reflect on how FUTURISTIC it is.
Revision: r3543
Author: 	 petethegoat
2012-05-10 00:16:09 +01:00
Erthilo
d651a99fe9 TG: Committing a new map update for Ikarrus-
http://nanotrasen.com/phpBB3/viewtopic.php?f=15&t=8481&start=20#p106280
Committing for Sieve: (and WJohnston, I suppose~)
Added WJ's alien hunt sprites.
Fix for the misplaced update ID line in the PDA.dm
Slightly updated mining turfs

Also adding a define for Cheri's balaclava sprites, and a new type of cigarette
packet (not available in game, currently)
Revision: r3540
Author: 	 petethegoat
2012-05-09 23:38:08 +01:00
Erthilo
ffeb9a958a TG: Fixes some mix-up with what hand was lost
Regenerate admin verb now restores limbs/lost blood
Fixes power_loss proc to actually respect the electrical channel something is
on.
Revision: r3539
Author: 	 VivianFoxfoot
2012-05-09 23:29:06 +01:00