Erthilo
dbbcefa9ca
Adds logging for throwing living mobs and throwing items that hit living mobs.
2012-05-12 17:24:05 +01:00
Erthilo
aaa3e11993
Merge branch 'master' of github.com:Baystation12/Baystation12
2012-05-12 16:42:54 +01:00
Erthilo
0850cd8ba4
Prevents chameleon effects from entering teleporters, hotfix for mobs being deleted.
2012-05-12 16:40:26 +01:00
Albert Iordache
e7843e6f2f
Merge pull request #964 from SkyMarshal/FEA
...
Improvements for FEA
2012-05-12 00:19:07 -07:00
SkyMarshal
9b7d626ecb
Merge pull request #1031 from Hawk-v3/master
...
More Mapfixes and stuff.
2012-05-11 18:34:09 -07:00
SkyMarshal
893529c69e
Fixes some FEA stuff, for a general improvement to how well the system runs.
2012-05-11 18:19:00 -07:00
SkyMarshal
50f7332740
Lets not keep debug in, whoops.
2012-05-11 18:06:21 -07:00
SkyMarshal
502c66664c
Some more work on FEA, WIP FEA/ZAS work, does not effect the game currently.
2012-05-11 18:06:21 -07:00
SkyMarshal
15d72e3b0e
Improves how gas mixture datums are handled, reduces proc calls, commenting. Removed ghost-heating from cryo and "oxygen_agent_b" gas type.
2012-05-11 18:02:30 -07:00
Hawk-v3
5ff2794cf2
More mapfixes and stuff.
2012-05-12 01:56:20 +01:00
Erthilo
035bc3541f
Fixes contraband and arts and craft crate.
2012-05-12 00:12:15 +01:00
Albert Iordache
ded68393ac
Merge pull request #1027 from Miniature/master
...
freelook bugfix, more information for admins in some ban messages
2012-05-11 11:06:58 -07:00
Hawk-v3
ee2b6a778c
Merge pull request #1028 from Hawk-v3/master
...
More Breakroom things, and a second Json fix.
2012-05-11 10:50:46 -07:00
Hawk-v3
fc2a7f3a81
More Breakroom things, and a second Json fix.
2012-05-11 18:47:00 +01:00
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
Hawk-v3
21f0783e90
Merge pull request #1018 from Hawk-v3/master
...
FORGOT SOEMTHING
2012-05-10 16:11:05 -07:00
Hawk-v3
6d97a71d98
FORGOT SOMETHING
2012-05-11 00:09:14 +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
ea6f906f14
Fixes RIG side sprites having bits of body poking through. Changelog!
2012-05-10 21:29:10 +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
CIB
2e97b4a109
Merge pull request #1013 from Erthilo/SkyMarshal-DetectiveWork
...
SkyMarshal Detective Work: Fucking hell. Makes the detective backend shit non-retarded. <3 Hashtables. Now with Antiqua disposals!
2012-05-10 09:16:14 -07:00
Erthilo
1512331aa7
Fixed icons and removed a duplicate.
2012-05-10 17:10:35 +01:00
Erthilo
d84d212d22
Fixes the changelog.
2012-05-10 17:00:34 +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
Albert Iordache
5a12b3e86a
Merge pull request #1012 from Erthilo/master
...
Fixes respawn and another infinite loop
2012-05-10 08:33:46 -07: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
CIB
ea3d11c118
Merge pull request #1011 from Erthilo/TGUpdates
...
TG updates up to r3571
2012-05-09 23:50:10 -07:00
Erthilo
d5007ff6cd
Changelog!
2012-05-10 03:39:27 +01: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
