eec378585f
Merge pull request #607 from Carn/AdminOOCfix
...
Resolves an issue with sanitize_hexcolor - It now has an optional defaul...
2013-05-28 16:18:40 -07:00
828e364363
Merge pull request #589 from Ikarrus/borgnerf
...
Cyborg Budget Cuts
2013-05-28 13:10:08 -07:00
36e2d0e30e
Merge pull request #650 from Carn/Issue630
...
Fixes #630 - The null-sound used to stop currently playing music was bei...
2013-05-28 11:31:04 -07:00
88253ce9cb
Merge pull request #625 from Rolan7/Issue566
...
Fixed a lot of text, mostly in simple_animal. The word "the" was being ...
2013-05-28 07:20:38 -07:00
67b8eab129
Merge pull request #651 from Carn/Issue610
...
Fixes #610 - You could only edit folder names when they were on your per...
2013-05-28 04:44:23 -07:00
b0f538d7a2
Merge pull request #632 from Carn/Issue619
...
*Fixes #619 - halloss can no longer stop death()
2013-05-28 04:35:24 -07:00
2e5232eea3
Merge pull request #648 from Ikarrus/acc_check
...
Check Contents now checks jumpsuits for accessories
2013-05-27 20:11:46 -07:00
1bba155748
Removed an unused list var from syndie shoes.
...
Merged the swat and jackboot icons. Fixes invisible swat boots.
2013-05-28 01:54:50 +01:00
7215a65f93
Merge branch 'altbranch' of github.com:Cheridan/-tg-station into borgi
2013-05-28 01:35:07 +01:00
b77c9751a0
Merge pull request #645 from Tenebrosity/miscissuefixes
...
[MAP] ~25 typo fixes, updated DJ station instruction sheet, replaced missing disposal pipe underneath HoP office door
2013-05-27 12:08:53 -07:00
4934c98bd7
Fixed common channel frequency mistakenly listed as 145.7 on DJ station paper
2013-05-28 06:27:51 +12:00
ac63e39c44
Fixes #610 - You could only edit folder names when they were on your person, unlike most other items. It now uses in_range() instead.
2013-05-27 09:44:29 +01:00
a140fb671c
Fixes #630 - The null-sound used to stop currently playing music was being used when turning sounds *on* rather than *off*. Sounds can now be stopped properly without triple-clicking the verb.
...
Modified code/modules/client/preferences_toggles.dm
2013-05-27 08:35:57 +01:00
f6c9d5d3ce
Check Contents now checks jumpsuits for accessories
2013-05-26 14:11:01 -06:00
2845065463
Adding lost pulls #590 #528 #574 #563 #529
2013-05-26 13:02:13 -06:00
6e873faf1f
* Edited encryptionkey.dm: Fixes about nineteen typos
...
* Edited tools.dm: Fixes "screwwy" typo in screwdriver description
* Edited paper.dm: Updates DJ station instruction sheet in light of the removal of the broadcaster and receiver from the DJ station
* Edited lib_items.dm: Fixes typo in "unwrenched" in a bookshelf deconstruction step
* Edited tgstation.2.1.2.dmm: Adds updated DJ station sheet to DJ station, replaces missing disposal pipe underneath HoP office door.
* Edited utility_closets.dm: Fixed oxygen closet description
* Edited DJ station paper to read better
2013-05-26 18:16:02 +12:00
8ee9a5c00e
*Fixes #619 - halloss can no longer stop death()
...
*halloss removed from all updatehealth() procs. I could see no reason for it to be there. Correct me if I'm wrong.
*Updated all updatehealth() procs to use maxHealth instead of magic numbers.
2013-05-23 17:15:26 +01:00
3523d9b58a
Improved a few lines based on Pete and Aranclanos's feedback. Also removed the "capitalize" call, which wasn't working, instead breaking the string up into two parts. BYOND macros are weird, but it works great.
2013-05-22 16:07:01 -04:00
78b4d985e1
Fixed a lot of text, mostly in simple_animal. The word "the" was being duplicated in a lot of cases when referring to objects or mobs. Basically, byond handles "the" for us. Poly was particularly guilty of this, but really it was all simple_mobs.
...
Also fixed issue 566, where it was possible to weaken corpses. Dead humans, humanoid aliens, and larvae should no longer be weakenable once they're dead.
Also also, changed the default name for human mobs from unknown to Unknown. This is makes them consistent with humans whose identity is destroyed by acid or face damage. They'll no longer show up as "The unknown" in messages, since Byond recognizes Unknown as a proper noun due to capitalization.
Finally, gave Runtime a DNA joke as a description. Not sure why she didn't have a description.
2013-05-22 05:24:44 -04:00
a9f73bc56a
Fixes #615 - mini icon for human-bodies now display correctly when examining humans.
2013-05-21 09:04:31 +01:00
c8428e3872
Resolves an issue with sanitize_hexcolor - It now has an optional default return value again.
...
Fixes some bad arguments in a call to sanitize_hexcolor which was causing admin ooccolor to be set to "000" on load.
2013-05-20 04:24:49 +01:00
3a70153d01
Merge branch 'master' of github.com:tgstation/-tg-station into DNAfix
...
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
2013-05-20 00:33:42 +01:00
9850a66cb0
Merge pull request #582 from Cheridan/radios
...
Phase 2 of my master plan:
2013-05-17 07:46:40 -07:00
37068f64db
THE BORGI UPDATE
...
-As requested by errorage, you can now place air/oxygen tanks and fire extinguishers on Ian's back. Additionally, you can also place cardborg suit/helmets on him.
-Cleans up some shoe code and unused sprites from feet/suit .dmis.
2013-05-16 19:02:40 -05:00
4ca036543c
-Updates DJ station infosheet.
...
-Adds service headsets to barman/botanist closets (chef doesn't get one for now since he doesn't have a closet, all his spare stuff is just placed in a crate)
2013-05-16 15:16:21 -05:00
a234e4a613
Merge branch 'master' of https://github.com/tgstation/-tg-station into borgnerf
...
Conflicts:
html/changelog.html
2013-05-16 09:02:06 -06:00
7e4730c1f5
Merge pull request #571 from Petethegoat/chemistry
...
Replaced most reagent initialisations with the helper proc create_reagents().
2013-05-16 03:41:18 -07:00
eb5e5a975f
Merge pull request #539 from SuperSayu/corgi-inventory
...
Corgi Inventory Update
2013-05-16 03:40:55 -07:00
d4f7655859
Update examine.dm
2013-05-15 23:24:24 -05:00
b0e8d18e30
-Rewrote unequipping modules for cleaner code
...
-Cyborg rods now properly regenerate in while charging
-cyborg rods can no longer be used to generate metal
-Removed roman numerals from the icon
2013-05-15 22:23:07 -06:00
cc67adb828
Merge branch 'master' of https://github.com/tgstation/-tg-station into borgnerf
2013-05-15 19:05:09 -06:00
0bd3a5a534
Merge pull request #528 from Rolan7/HydroponicsTweaks
...
Changed moneyplants to use the plant's potency...
2013-05-15 14:02:28 -07:00
e54bc1aee0
Replaced borg crit state with a gradual breakdown of its functions.
...
Moved the self check after the health check for welding tools
2013-05-15 08:25:02 -06:00
ba1277ac1e
Merge branch 'master' of https://github.com/tgstation/-tg-station into borgnerf
2013-05-15 07:49:34 -06:00
65b7b1765f
Merge pull request #574 from Carn/Issue559
...
Fixes #559 - Changelings are no longer so obviously faking when they are...
2013-05-15 02:38:40 -07:00
0eaba8311d
Merge branch 'master' of https://github.com/tgstation/-tg-station into borgnerf
...
Conflicts:
html/changelog.html
2013-05-14 22:17:23 -06:00
faa3fd6c10
Cyborg Budget Cuts
...
-Cyborg RCD cost increased from unit*30 to unit*160
With a standard 15k power cell, you can still build:
93 floors
31 walls
18 deconstructions
9 airlock operations
-Reduced cyborg health from 300 to 200
-Cyborgs with less than 100 health can not use any modules, but can still move, speak, and wirelessly interact with machines
-Engineering cyborgs can now use metal rods
-Updated changelog
2013-05-14 22:12:15 -06:00
18d25a6bf5
-Changes the channel hotkey from Q to V
2013-05-14 15:32:06 -05:00
7c2e7b9f52
Merge branch 'master' of https://github.com/tgstation/-tg-station into Master
2013-05-14 15:11:37 -05:00
cfbd530a2b
Merge pull request #563 from Malkevin/prisonercards
...
Proper Vandykes
2013-05-13 23:29:33 -07:00
ecd209a6f6
Merge pull request #529 from KazeEspada/mice
...
mice become items when they die.
2013-05-13 12:03:23 -07:00
0c47147ab1
Phase 2 of my master plan:
...
-Adds a Service headset channel, given to the botanists, barman, and chef. The HoP also gets the service channel on his headset.
Note: The Service Preset Server will have to be added to Telecomms on the map before the channel is usable. I'll put up the map when/if this gets merged.
2013-05-13 12:20:12 -05:00
4627e5459c
*Fix for syringes
...
*Fix for one icon_state being the wrong shade (apparently)
2013-05-13 01:48:41 +01:00
8ce6ed460b
PR #560 - Enabled security clearance checks for SecHuds.
...
Checks can be bypassed via EMPs.
Modified code/modules/clothing/clothing.dm
Modified code/modules/clothing/glasses/glasses.dm
Modified code/modules/clothing/glasses/hud.dm
Modified code/modules/mob/living/carbon/human/human.dm
Modified html/changelog.html
2013-05-12 20:48:23 +01:00
0fe659c43c
Fixes #559 - Changelings are no longer so obviously faking when they are faking death.
2013-05-12 20:34:42 +01:00
ff6cd843d8
Merge pull request #522 from Ikarrus/acidfix
...
Acid Damage Fix
2013-05-12 07:41:54 -07:00
31c4a7559b
Merge pull request #537 from Ikarrus/plastic
...
Facial Reconstruction Surgery
2013-05-12 07:23:06 -07:00
46b8ba8341
Merge branch 'master' of github.com:tgstation/-tg-station into chemistry
...
Conflicts:
code/game/objects/items/weapons/tools.dm
2013-05-12 15:09:21 +01:00
7d3236ca1e
Resolves an issue with commit https://github.com/tgstation/-tg-station/commit/f3996dfc5e64408ec95f9b43fe05df348af5978c doing the opposite of what it was supposed to.
...
Mobs can now become bloody again...after 9 months of going unnoticed.
Credits to Mport for this fix <3
Modified code/modules/mob/living/carbon/human/human_defense.dm
Signed-off-by: carnie <elly1989@rocketmail.com >
2013-05-12 11:07:31 +01:00
1c1b33bd8d
Pull Request #548 - vareditting ckey, key, icon, icon_state, overlays, underlays have permission alternatives
...
Fixed indentation reauthored and rebased ~Carn
Fixed the things carn pointed out. Thanks. ~Intigracy
ckey editing and icon editing changes, added alternate requirements besides +DEBUG. ~Intigracy
Modified code/modules/admin/verbs/modifyvariables.dm
Signed-off-by: carnie <elly1989@rocketmail.com >
2013-05-12 02:42:52 +01:00
Pete Goodfellow
Carnie
Pete Goodfellow
Ikarrus
Tenebrosity
Rolan7
Cheridan
Giacomand
Cael Aislinn
Aranclanos
Malkevin
Intigracy