Commit Graph

4785 Commits

Author SHA1 Message Date
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
Hawk-v3
4c0b24e511 Merge pull request #1058 from SkyMarshal/BugFixes
Made req_access work like req_one_access used to; req_combined_access is now used for when you need more than one type of access to be checked together. Adjusted maps to reflect this.
2012-05-14 16:46:22 -07:00
Erthilo
91595b5012 TG: -Fixed broken piping in DJ station
-Added a shower unit to virology's clean airlock
-Removed access requirement for Toxins Test Chamber, as it was before
-Courtroom witness box made easier to use
-QM now has full access to the departments he commands (mining)
-Beakers, small and large can now be made/recycled in autolathes. Large beakers
are significantly more expensive
Revision: r3592
Author: 	 ericgfw...@hotmail.com
2012-05-15 00:45:32 +01:00
Erthilo
0a7c3f8538 TG: -New PDAs for roboticists and shaft miners.
Revision: r3589
Author: 	 d_h2...@yahoo.com
2012-05-15 00:41:30 +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
Erthilo
eacd6b91e7 TG: -Defined a new area for the prison wing, so ghosts won't teleport to the admin
brig by accident
-Removed prison toilet disposals
-Reduced number of blast doors in prison wing, as it was overkill
-Fixes prison break event to also affect the prison wing
-Restores geneticists' supervisor text and headsets to include the RD
-HoP now starts with full access to his departments (all Supply and Civil)
Revision: r3587
Author: 	 ericgfw...@hotmail.com
2012-05-15 00:16:31 +01:00
Erthilo
a04d0d9fa3 Re-adds stripping var logging. 2012-05-15 00:14:50 +01:00
Erthilo
363dd54b7e TG: A few map fixes, plus new toilets, urinals, and showers.
All bathroom stuff is fairly WIP at the moment.
The toilet path has changed from /obj/machinery/disposal/toilet to
/obj/structure/toilet
Revision: r3586
Author: 	 petethegoat
2012-05-15 00:11:18 +01:00
SkyMarshal
148e49408b Merge pull request #1059 from Erthilo/master
New sprites for bomb suit, in-hands for pulse rifles, advanced energy guns, and laser guns. Customs for sicktrigger, lexusjjss, and roaper. Changes to the MOTD to match the server and remove the changelog link.
2012-05-14 15:20:31 -07:00
Erthilo
8d0338ecad New sprites for bomb suit, in-hands for pulse rifles, advances energy guns, and laser guns. Customs for sicktrigger, lexusjjss, and roaper. Changes to the MOTD to match the server and remove the changelog link. 2012-05-14 23:09:00 +01:00
SkyMarshal
2c18852662 Made req_access work like req_one_access used to; req_combined_access is now used for when you need more than one type of access to be checked together. Adjusted maps to reflect this. 2012-05-14 15:04:38 -07:00
SkyMarshal
b2d2bff7a2 Add the capability for the NT chatbot pAI to use the PDA's messaging function instead of the system it had been. Also, several bugfixes for runtimes. 2012-05-14 12:19:15 -07:00
cib
c5bb020a31 Fine-tuned meme verbs a bit. 2012-05-14 20:27:55 +02:00
SkyMarshal
e1b0fffc77 Fixes a runtime. 2012-05-14 10:17:34 -07:00
cib
cbc88f16a0 Forgot to commit the .dme 2012-05-14 18:00:00 +02:00
cib
41a2b60520 Merge github.com:Baystation12/Baystation12 2012-05-14 17:55:19 +02:00
CIB
d357e41fd6 Merge pull request #1050 from Erthilo/TGUpdates
Fix for brig timer spacing. Minor grammar fixes. Fix for logged out people not staying asleep.
2012-05-14 08:51:37 -07:00
Erthilo
d75892b1c9 Reverts carbon.dm 2012-05-14 16:43:50 +01:00
cib
c7cfe85ad5 More work on Meme verbs. 2012-05-14 17:36:00 +02:00
Miniature
eed87489ca Merge branch 'master' of github.com:Baystation12/Baystation12 2012-05-15 00:52:14 +09:30
Miniature
773253a5ec Fixed a mirrored tvalve icon, made mirrored tvalves do initialize_directions properly 2012-05-15 00:51:02 +09:30
Albert Iordache
b2022e5333 Merge pull request #1053 from SkyMarshal/BugFixes
Bugfixes for some temperature sharing, added variable editing by reference, fixed up some wound stuff.
2012-05-14 02:43:50 -07:00
Uristqwerty
bcc3972fbe Minimap (work in progress):
- Uses freelook visibility calculations
- all visible turfs represented as a 2x2 square
- - doors, windows, and structural objects that block movement show up in different colours from walls, floors, and space
- - windows and windoors that only block the edge of a tile show as a 1x2 line
- Areas that were visble but now aren't display in red. This will happen during regular activity, as doors open and close, as well as during abnormal circumstances, such as a camera being disabled/destroyed, or additional walls being constructed that block a camera's LOS.
- changes in visibility in an area triggers a map update which takes place two minutes later, reducing amount of processing (since further update triggers are ignored until the pending update has taken place), and give antagonists time after disabling a camera to conduct their business, before the map reveals that anything is out of the ordinary.

Sample screenshot: http://i.imgur.com/PS2vF.png

Todo:
- Remove test verb available to everyone, replace with AI-only (and perhaps avaiable to admins and ghosts?) verb.
- Clicking a tile immediately enters freelook and jumps to that tile
- Perhaps overlay blinking blue for areas with atmosphere alerts, brown for power? Independant of visibility, or centred on APC?
- A verb to force-update the current 3x3 area, while in freelook?
2012-05-14 04:04:56 -04:00
SkyMarshal
be6368b71c Bugfixes for some temperature sharing, added variable editing by reference, fixed up some wound stuff. 2012-05-13 23:18:02 -07:00
Albert Iordache
674432ae22 Merge pull request #1052 from SkyMarshal/BugFixes
Adds runtime detection to the atmos ticker.  20 ticks of runtimes, total, will kill atmos.
2012-05-13 22:36:22 -07:00
SkyMarshal
c7133a17a7 Adds runtime detection to the atmos ticker. 20 ticks of runtimes, total, will kill atmos. 2012-05-13 22:14:53 -07:00
Albert Iordache
dc65d21054 Merge pull request #1051 from SkyMarshal/BugFixes
Some feedback shit for deleted airgroups, as well as a possible fix for "NT, admins"
2012-05-13 21:42:50 -07:00
SkyMarshal
46e104f978 Merge pull request #1044 from Erthilo/master
TG Updates up to r3585
2012-05-13 21:38:34 -07:00
SkyMarshal
c54d44517e Some feedback shit for deleted airgroups, as well as a possible fix for NT and his admins command. 2012-05-13 21:14:18 -07:00
Erthilo
9d5f0cce5c Fix for brig timer spacing. Minor grammar fixes. Fix for logged out people not staying asleep. 2012-05-13 23:50:27 +01:00
SkyMarshal
5e45382ded Fuck atmospherics code. Actually, Fuck BYOND @.@ 2012-05-13 14:32:59 -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
Albert Iordache
2c08c02099 Tempfix for atmos runtime errors 2012-05-13 22:21:53 +03:00
Erthilo
f5bf874d17 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-05-13 16:16:48 +01:00
Albert Iordache
9d645d80c7 Merge pull request #1041 from Flashkirby/master
Fixes capitalisation inside names
2012-05-13 03:00:39 -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
SkyMarshal
702064e258 Merge pull request #1043 from SkyMarshal/FEA
Made pipes update right.
2012-05-12 18:00:59 -07:00
SkyMarshal
ec593612a9 Made pipes update right. 2012-05-12 17:59:48 -07: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
7cc3b7fb43 TG: AutoUpdateTK lags tremendously. TK functions as it used to before Doohl gave it
a minibuff.
This is not to be added again until it someone rights a less laggy version.
Revision: r3580
Author: 	 rockdtben
2012-05-13 00:42:09 +01:00
Erthilo
be9ff4e9e1 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-05-13 00:33:07 +01:00
Erthilo
ab552e20d1 TG: Renamed access_medlab to access_genetics.
Gave the RD his genetics access back.

Added Invisty's hyperspace tiles.
Added Icarus's map updates (Sec, gateway room, genetics/RD access) ((this is a
big overhaul to sec)).
Added Flashkirby99's SMES sprites.

Updated the changelog.
Revision: r3576
Author: 	 petethegoat
2012-05-13 00:24:34 +01:00
Flash Kirby
ec6e1ab880 Added in a script so that a new name is capitalized properly, but will keep uppercase letters e.g:
urist mcDorf --> Urist McDorf.
2012-05-13 00:04:21 +01:00
Erthilo
2a0caf890d TG: - Added QualityVan's fix for large glass windows not requiring 2 glass pieces.
- Took 'Evolve Greater Changeling' off the Evolution menu. It still exists, it's
just hidden until it's finished (i.e. gets a sprite)
Revision: r3575
Author: 	 johnsonmt88
2012-05-12 23:27:24 +01:00
Erthilo
f3e8997463 TG: Hotfix for the Holodeck.
Revision: r3574
Author: 	 johnsonmt88
2012-05-12 23:25:51 +01:00
cib
e408cad967 Fixed a bug where memes wouldn't be added to their host's parasite list. 2012-05-12 21:41:56 +02:00
SkyMarshal
c43ee6dc57 Merge pull request #1037 from comma/master
Police tape overhaul
2012-05-12 12:28:41 -07:00
unknown
9efafd39bd Police tape overhaul
General purge of copypaste code

Framework for easier adding of new tape types
Now you only need two sprites of roll and sprites of tape length (H and V)
Define them in police_tape.dm

To show it off, engineering tape added, passable by engineers and atmos techs

Last but not least - ability to lift the tape, allowing passage for pretty much everything.
Done by those with access, attack by empty hand on help intent.
2012-05-12 22:16:23 +03:00
CIB
a17e3d4656 Merge pull request #1035 from Erthilo/master
Various bug fixes.
2012-05-12 11:11:57 -07:00