Commit Graph

2498 Commits

Author SHA1 Message Date
caelaislinn
c46d2920a6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-06-25 18:07:47 +10:00
CIB
47aca7ca44 Merge pull request #1393 from CIB/master
Fixed a derp
2012-06-24 19:30:27 -07:00
cib
7f5db7ab68 Fixed BE_CULTIST/BE_PAI derp. 2012-06-25 04:27:19 -07:00
caelaislinn
7bd5beeb17 anomlies now have an activated and non-activated sprite
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-25 09:26:50 +10:00
caelaislinn
00493873c0 artifacts have a disable message
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-25 09:03:39 +10:00
caelaislinn
f131543fb7 fix for never closing bug
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-25 08:55:28 +10:00
caelaislinn
beb863020b more tweaks and fixes
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-25 08:50:03 +10:00
caelaislinn
ddda9f2ce3 fixes and tweaks for the harvester
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-25 08:35:19 +10:00
caelaislinn
137e15ef62 this should fix the power harvester bug
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-25 07:59:08 +10:00
Albert Iordache
156f1349c2 Fixed compilation error and moved acid_act() 2012-06-24 19:13:51 +03:00
caelaislinn
a240dc71ba added acid_act() proc, works similarly to proc on luna code, fixed some anomaly bugs
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-25 01:48:55 +10:00
caelaislinn
2237e3f658 talking crystal can be heard with ghost ears
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-24 19:58:21 +10:00
caelaislinn
021ddbde38 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-06-24 16:36:47 +10:00
SkyMarshal
315e027b05 Merge pull request #1385 from SkyMarshal/BugFixes
Sanity for the "give" command, changelog.
2012-06-23 21:39:46 -07:00
SkyMarshal
484c01498d Sanity for the "give" command, changelog. 2012-06-23 21:38:39 -07:00
caelaislinn
37e76d7436 artifact machinery now uses power
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-24 11:57:32 +10:00
caelaislinn
639c00fb66 fix for "the floor emits a pulse of energy"
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-24 11:45:51 +10:00
Erthilo
a4f3cada24 Compile error fixing. 2012-06-24 02:42:30 +01:00
Erthilo
ce6cd204f2 Accidentaly reverted a file. 2012-06-24 01:57:12 +01:00
Erthilo
b3285fd716 Updated use of gender proc. 2012-06-24 01:54:48 +01:00
Erthilo
0f8cf93095 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-06-24 01:53:10 +01:00
Erthilo
163c269cc3 Fixes disarm not working due to armour. 2012-06-24 01:52:44 +01:00
Erthilo
f88f097777 Fixes ghost with ghost ears off hearing whispers. 2012-06-24 01:23:43 +01:00
Erthilo
85f75e639c Fixes morph and appearance editing not updating sprites. 2012-06-24 01:12:16 +01:00
Erthilo
a5adf9377f Fixes changing hairstyles if you pick the same species. 2012-06-24 01:11:31 +01:00
SkyMarshal
0737f64d12 Goddammit 2012-06-23 17:07:33 -07:00
SkyMarshal
ea5913fde8 *sigh* Missed some stuff, compile fix. 2012-06-23 17:02:30 -07:00
SkyMarshal
3efa1d4e6b More fixes. 2012-06-23 17:00:28 -07:00
SkyMarshal
25757511d6 Fixed a derp 2012-06-23 16:36:34 -07:00
SkyMarshal
62c3d1d11d De-retarded wound system. 2012-06-23 16:35:58 -07:00
Erthilo
00b4a234c4 Merge fixes. 2012-06-23 22:17:59 +01:00
Erthilo
3df776b082 TG: - Added a parser to adminhelps. When someone sends an adminhelp it looks through
the words for mob names, keys and ckeys. These are then displayed in bold and
black with a (?) next to them. Clicking the questionmark will display additional
information about the mob.

Screenshot:
http://www.kamletos.si/Adminhelp%20parser%206.PNG
Revision: r3778
Author: 	 baloh.matevz
2012-06-23 17:36:02 +01:00
Erthilo
4f4ebd809d TG: Comitting for Giacom.
Details here: http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=8960

And, to summarise:
Added a new computer, the message monitor console. It is able to access the logs
on the message server.
Made PDAs dependant on the message server instead of Telecomms. This fixes PDAs
not sending any messages due to no listening_freqs.

When paper is splashed with Ethanol, the contents of the paper or book
disappear.
Added white coloured pens. Allows you to write hidden messages that can be
revealed by highlighting the text.
Revision: r3777
Author: 	 petethegoat
2012-06-23 16:42:37 +01:00
Erthilo
a9bfaf4173 TG: - Added basic heavy-duty cables, they cannot be destroyed with wirecutters,
unfortunately they currently cannot be created either. Not present anywhere on
the map yet.
- Fixed a bug with masks, which did not follow the equipment rules of the
SLOT_MASK flag.
- Fixed a problem where monkeys could not equip a backpack.
Revision: r3774
Author: 	 baloh.matevz

TG: - Added the heavy cable sprites, sprited by Thunder11.
Revision: r3775
Author: 	 baloh.matevz
2012-06-23 16:21:44 +01:00
Erthilo
e7e1b8f9e8 More compile stuff. 2012-06-23 16:14:00 +01:00
Erthilo
8b4033c410 TG: - Ported cable restraints from Bay12. You make them by using a verb on cable
coils. Takes 15 lengths to make, applied the same way as handcuffs, they have
the same effects as handcuffs, but only take 30s to remove if you resist. They
can also be removed by using wirecutters on a handcuffed mob.
- Added 4 new cable colors. Pink (ported from Bay12), orange, cyan and white.
- Engineer tool belts can now also spawn with orange wire, in addition to yellow
and red.
- Tool closets and electrical toolboxes can now spawn with cables in any of the
8 colors.
- Added cablecuff.ogg from bay12, played when you apply cable cuffs on someone
- Added this stuff to the changelog

So yeah, some stuff is credited to bay12, tho some of it was nearly enough
completely recoded.

Screenshots:
http://www.kamletos.si/wire%20colors.png
http://www.kamletos.si/cuff%20restraints.png
Revision: r3770
Author: 	 baloh.matevz
2012-06-23 16:04:24 +01:00
Erthilo
6cf06cc9ac TG: - Added a cookie food type, which cannot be made ingame
- slightly altered the pray format to include a (SC) link, which stands for
'spawn cookie'. This attempts to spawn a cookie in the hands of the person who
prayed. It's intent is to be a consolation prize when the prayer cannot be
answered, due to it ruining the round. Only humans will get a cookie.

Screenshot:
http://www.kamletos.si/cookie%20spawner.PNG
Revision: r3766
Author: 	 baloh.matevz
2012-06-23 15:49:05 +01:00
Erthilo
f63b61cbda TG: Fixed some lag caused by improper usage of loops. Enjoy.
Revision: r3764
Author: 	 rockdtben
2012-06-23 15:39:43 +01:00
Erthilo
e379715ce6 TG: - Department radio keys are now a global list and no longer a list that gets
created every single time 'say :X' is used
- You can no longer whisper when stung by a changeling or had another thing make
your 'silent' var get set.
- Added a single empty toolbelt to robotics, added a wrench and screwdriver to
toxins.
- Power cells now always spawn full. The double use of the 'charge' variable was
not good, as when creating the map it had a value of 0 - 100 to represent the
percentage of the cell's power, while it was used as a numeric representation of
the amper-hours that were still left in the cell. The problem this caused was
that cells created mid-round (cells which spawned in closets or were spawned by
admins) always started empty. They all start fully charged now. Additional
obj/item/weapon/cell/X/empty types were added if we want empty cells.
Revision: r3763
Author: 	 baloh.matevz
2012-06-23 15:36:53 +01:00
Erthilo
13aa7558a6 TG: Fixes a pesky compile error in my last commit.
Revision: r3756
Author: 	 vageyenaman
2012-06-23 15:10:49 +01:00
Erthilo
dfb6676ebb TG: Not a whole lot going on in this commit, just more work on preparation for the
traitor factions update. Added some new sprites and weapons.

New weapon: Delivery grenade. Can spawn an x amount of mob/object y in a
constant radius. It is currently used for carp and manhack delivery grenades.

!! Important !!: Certain telecomms computers were causing very nasty machine
disruption through some very silly mishap involving re-programming a computer's
network. Basically, it was breaking machine procs every time you messed with
them. This should hopefully make telecomms a lot more stable.

Fixed a bug where the reflexes nanoaug would not actually dodge the projectile
if the person was clicking directly inside the target's 32x32 border.

I changed around some core PDA messaging functions in preparation to PDA
Chatrooms (yes Legality it's happening). However I'm going to hold off actually
implementing it until Messycakes is either completed with his PDA UI overhaul or
just stops working on it.

Committed two patches from separate people in the forums. Chemical Cigarettes by
Neek (http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=8775) and Clicking
genetics blocks by Willox
(http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=8857). Check their respective
threads for more details. Sorry I couldn't get this earlier, guys!
Revision: r3755
Author: 	 vageyenaman
2012-06-23 14:59:54 +01:00
Albert Iordache
7a22acef57 Merge pull request #1372 from caelaislinn/master
anomaly bay tweaks
2012-06-23 05:03:11 -07:00
Albert Iordache
146703b756 Merge pull request #1369 from CIB/master
Optimized UpdateDamageIcon
2012-06-23 05:01:48 -07:00
caelaislinn
97f8bcffff prevent an artifact from being analysed and harvested at the same time
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-23 16:51:51 +10:00
caelaislinn
c282fbe866 correctly choose random dir on rebound
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-23 16:24:37 +10:00
caelaislinn
0b38e9f13c crystal / beam collision tweaks
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-23 15:24:25 +10:00
caelaislinn
fda643647a removed New() debug message
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-23 15:19:55 +10:00
caelaislinn
b7e22da1d5 more artifact tweaks
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-23 15:18:26 +10:00
cib
b1774030df Issue #1366: Optimized UpdateDamageIcon 2012-06-22 22:10:26 -07:00
caelaislinn
66769fec4f arty tweaks
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-23 14:49:22 +10:00