Commit Graph

1347 Commits

Author SHA1 Message Date
Hawk-v3
e68a32c173 Revert All of Cael_Aislinn's stuff from the last day, committed by Cib.
Reason: Compile Error, hung server. Damnit Cael.
2012-06-15 22:33:18 +01:00
CIB
e9c3cba9da Merge pull request #1291 from caelaislinn/master
buildable shield generators, new contraband items, misc
2012-06-15 03:39:43 -07:00
caelaislinn
37bee15787 missed some contraband additions (deadrum, sprites)
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-15 00:06:06 +10:00
caelaislinn
abb12d1366 added some new contraband items
- absinthe, a strong alcohol with an LSD-like effect
- deadrum, a poisonously sweet form of rum
- cigars
- blood tomato seeds
- liberty cap seeds
- plump helmet seeds

* Cigars are also [still] obtainable from cigarette vending machines, if you have a coin

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-14 23:54:14 +10:00
caelaislinn
3f19d356d6 wip explosions modifications
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-14 22:52:23 +10:00
SkyMarshal
d4393c482d Removed a duplicate proc. Pimped out the Blueprints. 2012-06-13 17:05:43 -07:00
SkyMarshal
1dea20c30e Merge pull request #1269 from Erthilo/TGUpdates
TG Updates r3721 to r3745 Redo
2012-06-09 17:50:05 -07:00
Erthilo
36877fcacd Blob code cleanup. 2012-06-09 15:24:47 +01:00
Erthilo
54ec9bdd84 Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates
Conflicts:
	maps/tgstation.2.0.8.dmm
2012-06-08 20:19:27 +01:00
SkyMarshal
a1a2302199 ZAS fixes, adds Atmos Lockdown which replaces all door accesses with engineering OR atmos access. (And a shitty temporary icon) 2012-06-07 20:50:42 -07:00
SkyMarshal
9f721a3209 Merge pull request #1262 from Erthilo/master
Anti-meta update for syndicate items + some message fixes + lagfixing
2012-06-07 14:19:27 -07:00
Erthilo
0890d48439 Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates
Conflicts:
	maps/tgstation.2.0.8.dmm
2012-06-07 19:58:21 +01:00
Erthilo
086a8fef37 Anti-meta update. Renames and re-icons a bunch of syndicate items to reduce meta from names and examine messages. 2012-06-07 19:54:37 +01:00
SkyMarshal
d9fd228c68 Some nice fixes for ZAS. 2012-06-07 10:36:43 -07:00
SkyMarshal
1059311b5b Debugged ZAS. Removed another duplicate proc. Made sure turf changes are added to the air_master to be updated. Fixed errors on the map causing problems. Added different sized packages. Airflow readded. 2012-06-07 01:15:14 -07:00
Erthilo
eb7ae97624 TG: Welding tool: Mostly code-related, the players won't notice much.
- Welding tool code how has proper comments! Maybe not "proper" but at least I
don't lie and say a proc is/does something that it doesn't actually do.
- Welders now start full of fuel instead of some random amount between 10-20
- Someone decided it would be a good idea to set the welding tool's 'on/off' var
in a ton of attackby() procs. These objects and turfs shouldnt even touch this
variable. This is why people have been noticing their welding being on without
the sprite or damagetype and amount reflecting that.
- - I've removed a bunch of these instances but there are so many objects and
turfs spread out through the code, there's no way to know if I've got them all
(This is the majority of the files)
- - I've created a new proc in welding tools that checks to see if they are
turned on or not. "isOn()"
- - Since I'm not sure if I've gotten every instance of this force-var-on, I've
set the welding tool to update it's icon every process(). I hate adding checks
like this to processes but it's necessary for now.
- Added a setWelding() proc. If you HAVE to turn the welding tool on or off, use
this, don't just change the var. In fact, dont even touch the 'welding' var
anymore
- Fixes  issue 435

While changing the hundreds(literally) of cases of welding tool uses I've
- Changed some :'s (object:varorproc) I've come across into .'s
(object.varorproc)
- Added checks to make sure the welding tool is actually on before using it
(some attackby()'s didnt have this. Heck, some checked how much fuel you had,
but didn't actually USE the fuel)
- Added sanity checks after some do_after()s that were missing them

Added traitor uplink items back to erro's stat tracker
- Added 'random' with the tag "RN"
- Added thermal meson glasses with the tag "TM"
- Reorganized uplinks.dm a little by moving the 'random' item generation to its
own proc
- NOTE: I have absolutely no way to test this on my own, but it should work!

I've tested a bunch of construction/deconstructions with the welding tool, but
again I've probably missed a few things. If there are any problems, please let
me know and I'll fix them asap.
Revision: r3741
Author: 	 johnsonmt88
2012-06-07 03:30:13 +01:00
Erthilo
2e8f1932a8 TG: - Deleted ERP.dmi
- Moved some objects into /effect
- Removed the debugger object
Revision: r3739
Author: 	 baloh.matevz
2012-06-07 02:41:38 +01:00
Erthilo
d4810cb90c TG: Added href logging as a config option. Log can be viewed via "investigate
hrefs". If on, it logs every link clicked. It may be useful for 'debugging' and
spotting malicious clients.

Anti-spam delay raised to 7 ticks. A little over half a second.

Revision: r3722
Author: 	 elly1...@rocketmail.com
2012-06-06 22:20:34 +01:00
Erthilo
98b51904eb Adds some logging for Atom/Del() to help track down CPU issues. 2012-06-06 04:52:19 +01:00
Erthilo
32a1d304ad Fixes for invisible appendices, changelog, readded disposals wall catcher. 2012-06-04 16:28:08 +01:00
Erthilo
808f76eaf3 TG: * Added pickup verb to all items
* Added "Toggle Open" verb to all closets and crates
* Added "Toggle Lock" verb to all lockable closets

* Modified the cloning computer's UI slightly, makes more sense, added a little
delay when scanning to improve user feedback when trying to clone several
braindead bodies.
Revision: r3712
Author: 	 daniel.cf.hultgren
2012-06-03 18:41:51 +01:00
Erthilo
1efb32e76a TG: Added WJohnston's inhand sprites for tools:
http://nanotrasen.com/phpBB3/viewtopic.php?f=10&t=8266
Revision: r3709
Author: 	 ericgfw...@hotmail.com
2012-06-03 18:05:02 +01:00
Erthilo
de809a19ae TG: Fix for Damage Icons. They now have a layer define too.
Revision: r3705
Author: 	 elly1...@rocketmail.com

THIS ALSO FIXES:
Not being able to put items on people's back or belt.
2012-06-03 17:41:54 +01:00
Erthilo
4fca7bb569 TG: -Moved engineering and bridge delivery chutes as windoors are now breakable
-Fitness equipment moved into closets
-Added a couple more syndicate shuttle spawn locations
Revision: r3697
Author: 	 ericgfw...@hotmail.com
2012-06-03 16:29:06 +01:00
Erthilo
4a0b380ae5 TG: Window doors are now breakable
- Window doors currently have 200 health, this can and will change if break ins
become too common.
- They still do not have wires, so you can not 'hack' them that way.
- As always, emags still hack open window doors

Changes to the hidden mining room treasures.
- Added quality pickaxes, jackhammers and drills as a possible treasure.
- - Higher quality tools are rarer of course
- - Plasma cutter is possible but rare
- Added a ripley (equipped with a drill and hydrolic clamp) as a possible
treasure.
- - There is a chance for the ripley to have a diamond drill instead of a
regular drill.

Modified the resource crate.
- - It no longer always gives you multiple stacks of every mineral.
- - It now gives you a chance to get each mineral based on rarity.
- - The size of the mineral stack is also partly based on rarity.
- - There is a very small chance to recieve nothing in this crate.
- - There is a very small chance to recieve a jetpack in this crate ontop of the
metal.

Updated the changelog
Revision: r3696
Author: 	 johnsonmt88
2012-06-03 15:22:42 +01:00
Erthilo
c3c5304397 Various fixes for bans and mutations. 2012-06-03 03:40:26 +01:00
Erthilo
c5ef488150 Fixes every having TK. As a side effect, nerfs TK back to match TG. 2012-06-03 03:34:35 +01:00
Erthilo
86feaac9c2 TG: Ban moved into IsBanned so that people whom are banned can actually see -why-
they are banned. Another perk of using IsBanned and not client/New() is that we
now disconnect potential clients before they are given a client object and start
downloading any resources...which is like a 30Mb saving per failed login (after
each server update).

Tidied up the Login and Logout procs for mobs. Moved the sandbox buildmode stuff
to mob/living/login.dm so you shouldn't have to log-out and back in to enable
build mode.

Removed the logged_in variable for mobs as it was the most pointless thing ever.

Made the multikeying checks a separate proc. People are checked the second they
get a new_player mob. Its notices are also less spammy.

Changed AllowUpload from the default. It now restricts uploads of over 1Mb to
prevent admins uploading massive .Oggs and lagging the server to hell whilst it
sends the ogg to 40+ players. Feel free to change the limit.

Moved some of the core client procs into one folder; they should really be
together and not in /modules/mob/mob.dm and various other places. I will be
giving the client stuff a belated spring-clean over the next few commits, just
got to iron out some of the kinks.
Revision: r3694
Author: 	 elly1...@rocketmail.com
2012-06-03 01:09:26 +01:00
Erthilo
218bf6643c Shortened MAX_NAME_LEN to 32. Change some MAX_MESSAGE_LEN's to MAX_NAME_LEN's 2012-06-02 22:53:19 +01:00
Erthilo
8268b3d824 Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates
Conflicts:
	code/game/objects/devices/scanners.dm
2012-06-02 22:12:07 +01:00
SkyMarshal
e79871e40b Detective improvements, take two. 2012-06-02 13:28:47 -07:00
Erthilo
36effbacc2 TG: There's a metric assload of stuff here, mostly in preparation to my massive
traitor expansion, so I'll try to be brief:

- I added in the foundations for traitor factions. See factions.dm for all the
different faction datums. They don't do anything yet.

- I completely ported mob/var/mutations from a bitfield to a generic list.
Mutation enumerated-identifiers are added into this list. For instance, TK = 1,
COLD_RESISTANCE = 2, XRAY = 3, etc... The purpose of this was because bitwise
operations could not actually be used after a certain size (because BYOND is
stuck in the 16bit era).

- I've added in completely-functional nano-augmentations. Check under
implantnanoaug.dm for a list of implants and implaners. As mentioned previously,
they are completely functional but may be slightly OP. Among these nanoaugs are
Super Strength, Psionic Radar, Electric Hands, Energy Blade/Sword Synthesizer,
Rebreather, Dermal Armor, Combat Reflexes, and Regenerative Nanorobots. I won't
go into detail as to what they do, but hopefully they should be self-
explanitory. If not, check out their descriptions in the file previously
mentioned.

- Added in a future traitor item, the Mind Batterer. Along with it a new .ogg
file.

- New telecomms bus mainframe sprite, thanks to WJohnston.

- New holdable shield, sprites courtesy of Muncher (i had to mangle the side
sprites because of a technical little issue. I'll change it back to the original
soon). It can be retracted and expanded. Probably only going to be given to
traitors.

- A couple of minor bugfixes here and there, along with some code tidying.

Hope this isn't too large a commit. I intended it to be MUCH larger, but I've
decided to split up my Traitor Factions expansion into smaller commits.
Revision: r3692
Author: 	 vageyenaman
2012-06-02 19:46:18 +01:00
Erthilo
1ece0d492f TG: -Adjusted balaclavas and added luchador masks. They replace the boxing gloves in
the fitness room.
-Tweaked fake moustache. It shouldn't work as internals, but it disguises your
identity.
-Fixed a couple flags for the sake of logic.
-Updated changelog.
Revision: r3691
Author: 	 d_h2...@yahoo.com
2012-06-02 15:46:40 +01:00
Erthilo
11529c1c4a TG: Fixes a derp I made with the PA in a recent commit.
Rules verb moved to the interface to make it more visible (so new players may
actually -read- it occasionally).

Minor changes to investigate singulo based on feedback. Entries are now
timestamped and the "time \ref[src] (location)" bit is in a smaller font.
Collectors note how much fuel they are loaded with.
Revision: r3687
Author: 	 elly1...@rocketmail.com
2012-06-02 01:12:34 +01:00
Erthilo
8d1f93fc49 TG: Updated toilets, urinals, and showers with NEW features.
The shower path has changed!
From /obj/structure/shower to /obj/machinery/shower

Made bookcases appear empty if they have no books, and fill up as more books are
placed in them.

Updated do_after() to have an extra var that determines if the user is required
to keep the item in the active hand. This is only used in swirlies at the
moment.
Revision: r3684
Author: 	 petethegoat
2012-06-01 23:28:13 +01:00
Erthilo
03737faf44 TG: Made you able to disassemble a few more computers. These are:
* Arcade
 * Prison Shuttle Console
 * Area Air Control
 * Atmos Alert Computer
 * Mining Shuttle Console
If anybody is not okay with this, feel free to comment out the attackby code of
that computer. But keep the circuitboard for future reference.
This should make all computers on the station be able to be disassembled.

Fixed some error message for cellchargers.
Revision: r3683
Author: 	 daniel.cf.hultgren
2012-06-01 23:18:12 +01:00
SkyMarshal
e97e99a046 Merge pull request #1220 from Erthilo/master
ERT updates, megaphone, AI holopad fixes, cleanbot limiter
2012-06-01 14:55:41 -07:00
Erthilo
45ee78bf44 Adds Flashkirby's ERT suits. Moved ERT's equipment to lockers so it's easier to edit in future. Edited medical ERT's loadout slightly. Added a megaphone that broadcasts a larger message than normal, gave on to each Head in their office. Changelog. 2012-06-01 22:49:01 +01:00
SkyMarshal
bb24bd6b2b Fixed two oopies. 2012-06-01 14:33:37 -07:00
SkyMarshal
b45afa1902 Some fixes for shit I found when porting stuff to TG. 2012-06-01 13:55:15 -07:00
Erthilo
014b91cda5 Compile fixes. 2012-05-31 15:14:53 +01:00
Erthilo
8e72965077 Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates
Conflicts:
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/grenades.dm
	code/game/objects/items/weapons/implants/implant.dm
	code/game/objects/radio/headset.dm
	code/game/objects/radio/radio.dm
	code/modules/assembly/assembly.dm
	code/modules/assembly/holder.dm
	code/modules/clothing/glasses.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/paperwork/paper.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	icons/mob/suit.dmi
2012-05-31 15:09:35 +01:00
SkyMarshal
2bc692ec4d Some improvements for the LiquidFood stuff. 2012-05-30 16:26:24 -07:00
Lexus Langg
04f19dea7f Added a Liquidfood dispenser, food, charge, and crate using a combo of mine and Kirby's sprite.
Fully tested, everything seems to work fine.
Signed-off-by: Lexus Langg <jaedonjacobi@yahoo.com>
2012-05-30 15:27:00 -07:00
Mloc
fbb67b2e42 Huge commit! Standardizes var definitions in most places.
Signed-off-by: Mloc <colmohici@gmail.com>
2012-05-29 16:26:48 +01:00
Erthilo
b409a84f2d Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates
Conflicts:
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
2012-05-29 15:00:11 +01:00
cib
3a74270e29 Merge github.com:Baystation12/Baystation12
Conflicts:
	code/modules/mob/mob.dm
	code/modules/projectiles/projectile/change.dm
2012-05-29 13:43:20 +02:00
Albert Iordache
604f7c417d Merge branch 'master' of https://github.com/Aryn/Baystation12 into Aryn-master
Conflicts:
	icons/mob/screen1_Midnight.dmi
	icons/mob/screen1_Orange.dmi
2012-05-29 08:50:58 +03:00
SkyMarshal
12392f74dd Merge pull request #1185 from Erthilo/master
HUD changes, medic spawn items, cow sprites, water bottles, Tajaran/Soghun fixes
2012-05-28 22:13:53 -07:00
Erthilo
1e022584ac TG: -New PDAs for atmos, genetics, and chemistry
-New sprites for engineering and medsci PDAs
-Warden area renamed to Armory
Revision: r3676
Author: 	 ericgfw...@hotmail.com
2012-05-29 01:12:08 +01:00