Commit Graph

6530 Commits

Author SHA1 Message Date
Giacom aaaed39293 Merge pull request #1559 from S0ldi3rKr4s0/fhair
Adds long bangs from my old disabilities PR
2013-10-24 09:10:14 -07:00
Cheridan 9996ded1f8 Merge pull request #1609 from Neerti/bedsheet_bug_fixes
[BUGFIX] Fixes two minor bugs with my bedsheet changes.
2013-10-23 10:59:00 -07:00
Cheridan 826325ade5 Merge pull request #1612 from Aranclanos/SmallAtmosFixes
Small atmos-related fixes
2013-10-23 10:39:13 -07:00
Cheridan cbdbd3cd32 Merge pull request #1617 from Aranclanos/Floorbot
Fixes a really weird runtime generated by a floorbot.
2013-10-23 10:17:26 -07:00
Cheridan 02b62b4bed Merge pull request #1616 from Aranclanos/RuntimingSongs
Fixes a runtime related to songs
2013-10-23 09:31:28 -07:00
Aranclanos 6bf59f9d5e Merge pull request #1611 from Mloc/tg-revenge
Fix for runtimes and an issue with flag conflicts.
2013-10-22 19:53:06 -07:00
Giacom 6c097a7816 Merge pull request #1604 from dumpdavidson/blobfix
AI/Borg blob candidate fix, secret mode forcing fix
2013-10-22 10:45:43 -07:00
Aranclanos d4930f228f Fixes a really weird runtime generated by a floorbot.
Floorbot code is awful guys
2013-10-22 06:59:14 -03:00
Aranclanos dd281bb6b2 Merge pull request #1561 from RobRichards1997/11/10/2013-Limbs-are-Objects
Changes Limbs into Objects [Merge/Give Feedback]
2013-10-22 00:41:09 -07:00
Aranclanos 5988e4b6a6 Merge pull request #1606 from Cheridan/Map
Nuke Op Gloves: The Blackening [MAP]
2013-10-22 00:32:19 -07:00
Aranclanos 89c3865a16 Fixes a runtime when a song tries to keep playing when the instrument was deleted 2013-10-22 03:47:49 -03:00
Aranclanos bbd1cfd389 -the number of active turfs on the status tab will be refreshed and the end of each tick and when the air controller setup finishes.
-mining rooms will be generated before the air controller is created
-changed the total of moles of the NO2 turfs from 2000 to 6000 to compensate the replacement of the canister that spawns like 36000 moles on top of it for a normal canister. I'm talking about the NO2 canister inside of the chamber in atmos. (I will replace the canister in another pull request)
2013-10-21 20:09:57 -03:00
Mloc 3930d1d5b4 Fix for runtimes and an issue with flag conflicts.
Signed-off-by: Mloc <colmohici@gmail.com>
2013-10-21 23:00:53 +01:00
Cheridan 6080088664 Merge pull request #1587 from Ikarrus/emergency
Comms Console Update/Emergency Maint Access [MAP]
2013-10-21 12:08:38 -07:00
Cheridan 9013796674 Merge pull request #1602 from Giacom/construct_spells
Constructs are now given their spells in the constructor
2013-10-21 11:30:10 -07:00
Neerti 1bdf2eec0c Fixes period in captain's bedsheet name and a graphical error with clown's bedsheet. 2013-10-21 13:58:05 -04:00
dumpdavidson f91aeb6505 You can now force any game modes in secret that would start normally.
Fixes #1600
2013-10-21 17:24:15 +02:00
Robson Richards a3e0921814 Removes super secret definitely not a proc for Augments
This should never have happened!
2013-10-21 16:06:58 +01:00
Robson Richards 9d9f642542 Makes Icon_name Redundant due to Obj Limbs
update_icons.dm altered to reflect this.
2013-10-21 16:01:58 +01:00
Cheridan 7506a19073 Nuke Op Gloves: The Blackening
-Removes the yellow gloves on the Nuke Ops shuttle. (They were completely redundant, as the gloves they start with were already insulated (!!!)).
-In return, adds a laundry room to the nuke ops staging area, allowing them to paint their gloves as they please if they want to be stealthy.
-Removes 'SWAT' gloves in favor of the less-weirdly-specific combat gloves. Codewise, they were exactly the same.

Updates spacebattle.dmm, as it had an instance of swat gloves.
Adds a link in the mapmerge tool instructions to assist in setup.
2013-10-20 23:09:22 -05:00
dumpdavidson 7acc38db36 Correctly fixes AI/Cyborg blobs this time. Unlike other game modes blob didn't manually remove the restricted jobs from the possible antag lists in pre_setup(). 2013-10-21 00:19:32 +02:00
Aranclanos 0a1baa0f34 Merge pull request #1586 from Giacom/mechas_suffocating
Fixes suffocating in mechs.
2013-10-20 14:38:18 -07:00
Giacomand 1aeed2d768 Changed the fluff text for creating constructs from a soulstone.
Added an attack_animal() for blob.
2013-10-19 21:19:58 +01:00
Giacomand 18d2672083 Constructs are now given their spells in the constructor, instead of from the soul stone. This will allow admin spawned constructs to start with spells. 2013-10-19 20:30:32 +01:00
Cheridan b16c18cb8a Merge pull request #1596 from AlexanderUlanH/fingerprint
DNA/Fingerprint Bugfixes
2013-10-18 23:54:50 -07:00
Cheridan 9204599fe8 Merge pull request #1597 from Giacom/misc_getrev
Added revision dates to getrev
2013-10-18 23:43:04 -07:00
Cheridan 148e36e464 Merge pull request #1590 from Giacom/shuttle_call
Made the emergency shuttle code use the defined times.
2013-10-17 15:46:49 -07:00
Cheridan 08eb771bfd Merge pull request #1582 from Giacom/fix_reconnect
Fixed players being unable to auto-reconnect to the server on Reboot(), because of duplicate keys.
2013-10-17 14:29:02 -07:00
Cheridan 39dde554cd Merge pull request #1592 from Giacom/smartfridges
Chemistry and Virology Smart Fridges [MAP]
2013-10-17 14:08:02 -07:00
Cheridan f2d1794430 Merge pull request #1569 from Malkevin/cultbugs
Fix: Converted Cultists not receiving objectives
2013-10-17 13:42:24 -07:00
Cheridan 9e58e3cd3c Merge pull request #1579 from Giacom/allow_ai
The Allow AI config option will now correctly stop players from choosing AI as a job.
2013-10-17 12:20:21 -07:00
Cheridan d7b7f19ed6 Merge pull request #1568 from Mloc/tg-fix3
Miscellaneous fixes and pipe unwrenching cleanup.
2013-10-17 12:08:52 -07:00
Cheridan 5c60ca8106 Merge pull request #1573 from Neerti/wearable_bedsheets_as_capes
Wear bedsheets... on your back!
2013-10-17 11:40:26 -07:00
Giacomand ade13452da * Added revision dates to getrev.dm
* By converting the unix timestamp of the git log, I was able to get the date of the revision.
 * It uses the new unix2date, which figures out the date, since you can't convert unix time to byond time through byond.
2013-10-17 18:44:35 +01:00
AlexanderUlanH 432f69d1ce Fixed a DNA runtime
No more trying to give robots DNA.
2013-10-17 11:03:42 -04:00
Giacom 1a23bc2326 Merge pull request #1555 from Ergovisavi/fire_explosion
Fiery Explosions! - And some wizard tweaks
2013-10-17 00:19:25 -07:00
Ergovisavi cd904826f1 Removed flame_range from meteor explosions, reduced flame_range on syndie minibomb, added flame_range to all welderbomb explosions, made args prettier 2013-10-16 22:10:26 -07:00
MrPerson 6b028c93ef Merge pull request #1583 from Giacom/ai_alt
The AI can now use alt click to get a list of objects and the turf for easy access. [CHANGELOG]
2013-10-16 15:34:46 -07:00
AlexanderUlanH cb2c8543f2 Fixed a Fingerprint Runtime
Typos, whoo.
2013-10-16 17:02:49 -04:00
Giacomand a4057966f6 * Fixed a small error with the pill_bottle check. 2013-10-16 20:08:29 +01:00
Giacom 38725a5098 Capitalized the names of the beaker research datums. 2013-10-16 20:01:06 +01:00
Giacom 0b9b6557fa Merge pull request #1546 from Iamgoofball/shrinkray
Beaker Update
2013-10-16 11:57:57 -07:00
Giacomand e6d23b2ad4 * Super thank you to SuperSayu for the smartfridge modifications, which makes smart fridges easier to customize.
* Added smart fridges for Virology and Chemistry.
 * The chemistry smart fridge was placed by the south desk, allowing medical doctors to grab medicine and for chemists to organize their medicine.
 * The virology smart fridge has been placed on a table and now stores the starting viruses that the virologist gets. As a bonus they also get a single bottle of mutagen and synaptizine. Do not worry, these bottles will need refills very quickly and you need to use at least 5 units for each reagent, to use them in creating viruses.
2013-10-16 19:32:05 +01:00
Giacomand fe0826c3d1 Merge branch 'master' of https://github.com/tgstation/-tg-station into ai_alt
Resolved Conflicts:
	html/changelog.html
2013-10-16 17:16:36 +01:00
Giacomand 646d7596f2 * Made the emergency shuttle code use the defined times.
* Added a SHUTTLEAUTOCALLTIMER define for the auto call.
2013-10-16 08:30:25 +01:00
ikarrus cb9b3cf375 Communications Console Update
-Added emergency maint access function to comms console. Removes access restrictions on maintenance and external airlocks. Can be toggled on and off. Captain-level access required.
-Minor modifications to map /area/s to make this work
-Updated Comms console interface (https://www.dropbox.com/s/zy33829tcqby9hd/comm.png)
-Message List is now restricted to Command Staff. (Classified transmissions go here!)
-AI can now control alert levels and emergency access via comms console
2013-10-15 22:42:20 -06:00
Cheridan ee91de30e3 Merge pull request #1575 from Giacom/malf_override
New Malf Power: Override Machine [CHANGELOG]
2013-10-15 19:07:12 -07:00
Giacomand 1cdef4d588 * Fixes suffocating in mechs.
* Tidied up the atmos mech code a little.
2013-10-15 23:01:34 +01:00
Giacom f1ad61609c Merge pull request #1580 from Atskadan/grammarfix
Fixes "Its locked!" in lockbox.dm
2013-10-15 02:11:33 -07:00
Giacomand 1bf07a3065 * The AI can now use alt click to get a list of objects and the turf for easy access.
* The AI can interact with all the items in the list.
* The AI can use this for several things:
 * Since the list will not dissappear for the AI, until there's no camera coverage, they can use it to bookmark a single tile to interact while not having to look at it.
 * They can also use this to quickly jump to the listed turf.
 * They can interact with objects under other objects.
* Made the CTRL Click on the APC directly use the toggle_breaker() proc.
2013-10-14 17:23:53 +01:00