Commit Graph

776 Commits

Author SHA1 Message Date
Erthilo
4f0763ada4 TG: - Wallets once again spawn in the satchels in the cabinets in the dorm.
- Wallets now fit in pockets
- If you are clicking on a storage item in your pocket with an empty hand it
will return that item to your hand
Revision: r3610
Author: 	 baloh.matevz
2012-05-19 01:44:24 +01:00
Erthilo
fa8e8decb4 Made rollerbeds collapsible. They don't fit in containers, so it's just easier to take to location. Added new sprites and sounds for cable cuffs, and new sounds for table smashy. 2012-05-18 00:56:53 +01:00
Erthilo
6130ce6d4a Adds camera film which can be used to refill cameras. Added to detectives wardrobe and arts and crafts crate. Minor grammar and punctuation fixes. 2012-05-17 21:32:34 +01:00
Erthilo
e9c3c990b1 Ported Animus Station's currency system, credit to @EditorRUS. ATM's now require a pin which is generated and stored in mob notes. Space cash renamed to stack of credits, and same value credits can be stacked together. Credits are generated randomly between 500 to 2000 credits. Credits or coins can be inserted and converted to credits. Still not used for anything! 2012-05-17 20:50:47 +01:00
Albert Iordache
c93bb9f245 Fixed #1079, airlock permissions for the prison wing and QM's office. 2012-05-17 13:41:01 +03:00
Erthilo
db3b96c0a7 Adds cable restraints that can be made from 15 lengths of coil, and fixes table grammar. Also reverts lockdown changes so it works for the Exodus for now. 2012-05-15 22:24:25 +01:00
Erthilo
51de17e8ad TG: Committing from the Proposed Commit forum:
Work by Neek
- Hulk Hogan moustache fix

Work by Yvarov
- Alien Unconciousness fix (Fixes  Issue 283 )
- - Also commented out alien snoring all over because aliens don't snore.
- Replacement light box fix (Fixes  Issue 398 )
- Syringe gun attack logs added (Fixes  Issue 465 )

Work by QualityVan
- Nettle and Death Nettle force based on potency.
Revision: r3593
Author: 	 johnsonmt88
2012-05-15 00:58:12 +01:00
Erthilo
496d6ce13b Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates
Conflicts:
	code/defines/obj/supplypacks.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2012-05-15 00:51:50 +01:00
Erthilo
97141927ef TG: Fixed an issue where contraband crates could not be ordered and would prevent
other crates in the same shipment from arriving.

Generalised the crate contents randomisation code to allow for future random-
contents crates and avoid unnecessary copypasted code.
Revision: r3588
Author: 	 musketstgstation
2012-05-15 00:25:52 +01:00
SkyMarshal
46e104f978 Merge pull request #1044 from Erthilo/master
TG Updates up to r3585
2012-05-13 21:38:34 -07:00
SkyMarshal
bdc0de5fd0 Fixes numerous bugs from the Runtimes topic, more sanity checking on pipes and atmos stuff for the new FEA. 2012-05-13 13:52:40 -07:00
Erthilo
1443df2beb TG: Updated fire extinguisher cabinets- mini extinguishers now fit in them, and the
path has changed!
/obj/structure/closet/extinguisher to /obj/structure/extinguisher_cabinet

Added Invisty's dragon dildo sprite
Updated the husk icons for carn

Revision: r3584
Author: 	 petethegoat

-New sound effects for circular saws and surgical drills.
-New sprites for mass-spectrometers and advanced mass-spectrometers.
-Sprites for empty bookshelves and book overlays added to library.dmi.

Revision: r3585
Author: 	 d_h2...@yahoo.com
2012-05-13 02:19:36 +01:00
Erthilo
8c3659b1c7 TG: -Laser tag guns no longer give combat tech of 3.
-Cardborg Helmets and Cueball helmets no longer protect as well as sec helmets.
Reorganized the clothing/head.dm. PLEASE take note of the parent when making
child objects, people.
-Laser tag vests can now hold their matching laser tag guns.
-Harebells can now be harvested.
-Sprite for the new mini-extinguishers in the extinguisher closets. Needs
supporting code still.
-Added towel sprite to items.dmi.
Revision: r3582
Author: 	 d_h2...@yahoo.com
2012-05-13 00:56:53 +01:00
Erthilo
035bc3541f Fixes contraband and arts and craft crate. 2012-05-12 00:12:15 +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
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
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
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
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
721eaefee1 Changes balloon description. It's just a balloon damnit. 2012-05-09 00:29:17 +01:00
Erthilo
76f88da735 Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates 2012-05-08 18:28:05 +01:00
CaelAislinn
bd86b7236f fixed some weird merge issues
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-05-08 15:43:41 +10:00
Erthilo
9cad6dfa39 Reverts one decal per tile code due to it breaking a few blood things. 2012-05-08 00:35:09 +01:00
Erthilo
026074d6c5 TG: (Might very possibly be broken. Didn't port most of the stuff due to it having been rewritten. - Erthilo)
Adds BS12 dismemberment.  Not all features of it are implemented yet, but it
should be equal to our previous system.
Adds greater changeling code, but doesn't change the genome count yet on it.
Renames registered to registered_name on IDs because bs12 had it and it seemed
like a good idea to do last night.  For some reason.
Adds an afterattack to mobs that can be used.  (In fairness, lots of shit in
attack_hand should be in there instead, like stungloves and stuff, to minimize
duplicated code)
Revision: r3537
Author: 	 VivianFoxfoot
2012-05-06 22:53:39 +01:00
Erthilo
53d03a49b6 TG: -New black pressure tanks sprites, at the behest of Petethegoat,
-Uploading Invisty's backpack storage message tweak.
-New plant mutation for blue-tomatoes: Blue-space tomatoes.
Revision: r3527
Author: 	 d_h2...@yahoo.com
2012-05-06 19:26:00 +01:00
Erthilo
f2777aa65f TG: Tonnes of stuff, please check the changelog.
In short: massive updates to security, the library, hydroponics, the kitchen and
the bar, by Flazeo and Ikarrus
Massive updates to the PA, with Invisty's new sprites, done by Sieve
New sprites for field gens too, also by Invisty
Borg and battery updates by Sieve
Fake gloves by Sieve
I messed around with some pressure_resistance stuff on Dumpdavidson's suggestion
(only in paperwork)

PROBABLY A BUNCH OF OTHER SHIT
Revision: r3505
Author: 	 petethegoat
2012-05-06 18:26:41 +01:00
Erthilo
5eddc86f6b TG: Added Wjohntsons little toy mechas.
Removed restrictions for cultists, anyone can be converted now.

Bibles no longer deconvert cultists to stop the random bible smashing from
ruining rounds

Soulstones can no longer capture the manifested ghosts. No more infinite
constructs.

Removed the telecomm traffic control from the map until its fixed.
Revision: r3500
Author: 	 kortgstation
2012-05-06 00:51:43 +01:00
Erthilo
2a837c9a26 TG: Quick fix for the ballistic gear crate, it now has the correct shotgun path.
Revision: r3496
Author: 	 petethegoat
2012-05-06 00:36:46 +01:00
Erthilo
d75bb980f2 TG: -Added chawanmushi recipe and beet soup recipes. Added a trash plate to metroid
sammiches.
-Ambrosia vulgaris now has a mutation.
-Added 1% chance for a species mutation whenever a plant's stats mutate.
-You now get more descriptive messages when applying mutagen to plant trays.
-Removed sugarcane seeds from the vending machine. They were redundant and had
poor sprites and no recipes. Added the seeds to the seeds crate so you can still
get them, if you really want to...
Revision: r3460
Author: 	 d_h2...@yahoo.com
2012-05-05 23:50:34 +01:00
Erthilo
a83c870358 TG: -Added soil to plant seeds in. Make it by crushing up sandstone. Soil does not
have indicators like trays do! Watch your plants carefully!
-Added money trees. When life gives you lemons, mutate them into cash.
-RnD can create a new tool for botanists: The floral somatoray. Has two modes.
Use it on your plants to induce mutations or boost yield.
-Raised the passive species-mutation chance slightly.
-Fixed a goof I made before when I was editing poppies. Woops.
-Changed the name of "Generic Weeds".
-Normalized grass harvests.
-Couple of typo fixes.
-Updooted my changelog.
Revision: r3495
Author: 	 d_h2...@yahoo.com
2012-05-05 23:45:45 +01:00
Erthilo
301fe9cd01 TG: - you can now only have ONE decal of blood per tile. This is to fix the millions
of blood effect items that spawned to lag anyone who right clicked them. The
most recently created blood item will be the one that remains. This does not
effect gibs.
Revision: r3490
Author: 	 baloh.matevz
2012-05-05 22:51:47 +01:00
Erthilo
be7d01fcb7 TG: - Added a 'random coloured' wire type, which gets it's color assigned only once
created.
- Added the tool vending machine to code. Sprites by... I forgot...
http://i.imgur.com/yedWM.png
Revision: r3472
Author: 	 baloh.matevz
2012-05-05 21:51:16 +01:00
Erthilo
afd33125ab TG: - hand tools now fit on your belt slot
- added feedback logging for newscasters
- added feedback logging for admin verbs
- added shuttle timers to escape pods
- added feedback logging to chemical reactions
- clipboard can now fit on your belt
Revision: r3465
Author: 	 baloh.matevz
2012-05-05 21:34:34 +01:00
CIB
00d227ea16 Merge pull request #974 from caelaislinn/master
releasing maplock for erthilo to merge antiqua changes.
2012-05-05 02:47:35 -07:00
CaelAislinn
93a56064bf WIP antiqua engineering, WIP antiqua supermatter research lab, r-ust updates, fixed dopeghoti's derp.
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-05-04 23:56:52 +10:00
Ren Erthilo
39f6da4c59 TG: Rewrote blackholes (gravitational anomalies) and wormholes to try and optimise
them a little. If you have any concerns about how I've done so just give me a
shout and I'll either rework them or revert my changes back. Wormholes
especially seem a bit faster on my laptop. Smoke has temporarily been removed
from the blackhole event until I get time to investigate why the hell
effect_systems are using so much memory ( spark effects were using 40% of my
processor a second ago D: ). To compensate this I made them a new sprite.

Commented out the authentication system. It was the remnants of the old goon
authentication stuff (or maybe even older) and wasn't actually used in our code
at all (at least not in any useful way, it was merely called and short-circuited
to 1, so all those if(authenticated) were totally pointless. This has removed 3
unused variables from every client, a bunch of unused variables from the config
and two empty text files!

Committed (as a config option) a feature requested by Apoc station. It causes a
'reply to' window to popup when an admin PMs a non-admin player. It's meant to
grab their attention so they can't say "I didn't see your PM". It defaults to
off. To turn it on just uncomment the #POPUP_ADMIN_PM line in config/config.txt

Fixed a derp in isday where it was fetching the month instead of the day.

Removed medal references from Gib()

Removed the medal_hub global variables because they aren't used in any way shape
or form.
Revision: r3444
Author: 	 elly1...@rocketmail.com
Date: 	Apr 12, 2012
2012-05-03 02:22:25 +01:00
Ren Erthilo
9c40ed3e9f TG: Fixing dem runtimes:
Temp-fix for mob/say.dm It's being sent null from Tcomms, so I'll leave it to
somebody with experience with that.

Fix for items bein  in your inventory and on the floor

Fix to stop people pulling themselves and causing runtimes (lol)

Fixes a bunch of stuff in the flash code. EMPs will now cause flashes to flash
their holder. They don't runtime when flashing cadavers. They don't runtime when
being EMPed. They will (hopefully) rev those select few buggy people who weren't
getting reved previously. (I can't fix that totally without playing with a bunch
of mind stuff)

Fix for throwing nothing. :P

Fix for removing tanks that don't exist from transfer valves.
Revision: r3441
Author: 	 elly1...@rocketmail.com
2012-05-02 23:58:53 +01:00
Ren Erthilo
a4e04d2915 TG: Runtime fixes for:
runtime error: Cannot modify null.layer. proc name: done
(/obj/effect/equip_e/human/done) usr: Ramona Fawkes (/mob/living/carbon/human)
src: the human (/obj/effect/equip_e/human)
call stack: the human (/obj/effect/equip_e/human): done() the human
(/obj/effect/equip_e/human): process()

runtime error: Cannot execute null.use(). proc name: attackby
(/obj/structure/barricade/wooden/attackby) usr: Jeffery Long
(/mob/living/carbon/human) src: the wooden barricade
(/obj/structure/barricade/wooden) call stack: the wooden barricade
(/obj/structure/barricade/wooden): attackby(null, Jeffery Long
(/mob/living/carbon/human)) the wooden barricade
(/obj/structure/barricade/wooden): DblClick(the floor (159,129,1)
(/turf/simulated/floor), "mapwindow.map", "icon-x=15;icon-y=12;left=1;scr...")

Rewrote wielded weapons to be their own weapon subclass. There was no point
having a var/wielded var/twohanded var/force_unwielded var/force_wielded for
every damn item when there is only 1 wield-able weapon anyway. All the wield-
able stuff is now in twohanded.dm

Changed the adminhelpsound to some creative commons sound I pinched. Until
somebody can get a better one. I'm sick of MAAAAAAAAOOOOOOW.

All PMs trigger the adminhelp sound. That means when you OM a player they get
the sound, if a admin is PMed they only hear it if their adminhelp sounds are
enabled. This should allow people to get eachother's attention when t he chat is
busy.

Fixed some bad code with poddoors (which is used for the shutters in QM)
Revision: r3435
Author: 	 elly1...@rocketmail.com
2012-05-02 23:09:19 +01:00
Ren Erthilo
396caaa260 TG: Late-join features and bug fixes:
- Merged 'Game' and 'Lobby' tabs during pre-game into one tab.
- Late-joiners now see round duration.
- Late-joiners are warned if the shuttle is not recallable or has already left
to Centcomm.
- Added the little red X to the top corner of the late-join job list window
- Supply shuttle derp fix
- Removed duplicate mining shuttle code that was inside atmos computer stuff
- - This should fix the player seeing both the 'Shuttle has been sent' and 'The
shuttle is already moving' messages.
- Updated changelog
Revision: r3433
Author: 	 johnsonmt88
2012-05-02 22:14:59 +01:00
Ren Erthilo
b3420a9518 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates 2012-05-02 00:37:35 +01:00
Ren Erthilo
adbfc370c1 TG: Updated Cell charger and recharger
Cell charger and Recharger are now wrenchable to make them moveable
Cleaned up autolathe code, removed the delay when inserting sheets, using any
item on it while maintence cover is open will result in cable window opening.
Revision: r3406
Author: 	 daniel.cf.hultgren
2012-05-01 23:24:19 +01:00
Mloc
d3366602f4 Added extra data to ID cards. (fingerprint, blood type, dna)
Signed-off-by: Mloc <colmohici@gmail.com>
2012-05-01 18:54:44 +01:00
Ren Erthilo
f27537a5c1 TG: Fixes for a bunch of other lingering bugs with my optimization stuff.
Revision: r3379
Author: 	 vageyenaman
2012-05-01 13:59:48 +01:00
Ren Erthilo
6c98b2048c TG:
Removes poo. XSI and co. weren't very fond of it, and the last thing I would do
is make them uncomfortable and challenge their leadership by keeping poo in.

An experimental lagfix, which removes a couple THOUSAND unnecessary machines
from the machine processing list. Please report any unresponsive machinery (as
result of this commit) as HIGH PRIORITY issues. I'm not quite sure how much lag
this will kill, but I'm confident that it will be at least slightly noticeable.

More work on step_triggers. The escape shuttle should no longer blast things
forever and give them infinite momentum.

Runtimes goin down for the count
Lookin at the ground
I think they a hater
Revision: r3370 r3371
Author: vageyenaman quartz235
2012-05-01 00:36:20 +01:00
Ren Erthilo
96406eebd3 TG: Fixes the way the safeguard module is written.
Adds a new high-risk module for fun.
Revision: r3355
Author: 	 VivianFoxfoot
2012-04-30 21:50:30 +01:00
Ren Erthilo
c426d5a4c3 New ATM sprites, and a green alt satchel for Botanists. 2012-04-30 14:59:09 +01:00
Ren Erthilo
bccd60b344 TG: Medical records searching now works with DNA and not just name/id.
Revision: r3323
Author: 	 quartz235
2012-04-29 20:19:30 +01:00
Ren Erthilo
4e07fa527c Adds and reorganises a bunch of custom items. 2012-04-29 02:27:02 +01:00
Ren Erthilo
e9dd09f298 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates 2012-04-28 17:24:38 +01:00