Commit Graph

23004 Commits

Author SHA1 Message Date
Datraen
fbb0f764d2 Adds a missing (src) 2016-06-02 18:12:21 -04:00
Datraen
e62b06e867 Merge pull request #1856 from SinTwo/frame_fix
Fixes fax runtimes at startup.
2016-06-02 15:19:01 -04:00
SinTwo
1b80af361e Fixes fax runtimes at startup. 2016-06-02 15:10:33 -04:00
Neerti
b160f369ea Merge pull request #1855 from Datraen/SparkQdel
Gives sparks a chance to qdel.
2016-06-02 14:51:57 -04:00
Datraen
be4a51eae8 Puts the qdel in initialize. 2016-06-02 14:36:53 -04:00
Datraen
804d69e965 Gives sparks a chance to qdel. 2016-06-02 14:31:20 -04:00
Yoshax
1980d2c741 Merge pull request #1853 from Datraen/XenobioUpdate4
Xenobio2 Update #4
2016-06-02 19:25:04 +01:00
Arokha Sieyes
63bf71e393 Sanitizing text twice breaks quotes
Someone didn't read the comment in text.dm helpers, I see. This text is sanitized 2 lines above. Don't do it twice, nothing changed.

Fixes https://github.com/VOREStation/VOREStation/issues/276

(Do cross-repo magic-word closes work? _We're about to find out!_)
2016-06-02 14:12:48 -04:00
Datraen
e6a90dbe6b Tweaks scanner, trait acquisiton for slimes, trait application for all xenos. 2016-06-02 12:34:31 -04:00
Neerti
a95b47174e Merge pull request #1851 from Yoshax/bugfixes
Adjusts the checks to ensure you cannot buckle two people to the same thing
2016-06-02 10:36:25 -04:00
Yoshax
4d3afc42b6 Adjusts the checks to ensure you cannot buckle two people to the same thing 2016-06-02 15:04:40 +01:00
EmperorJon
241c4714e9 Merge pull request #1847 from SinTwo/frame_fix
Removal of /map/New()
2016-06-02 02:10:39 +01:00
SinTwo
8edec2a5d1 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into frame_fix 2016-06-01 17:53:51 -04:00
Yoshax
f75d509e7f Ports event system from Bay 2016-06-01 22:05:04 +01:00
Datraen
2c95126a00 Merge pull request #1765 from Yoshax/cocainecocaine
Fixes snow and adjusts a definition
2016-06-01 15:57:15 -04:00
SinTwo
2d7d011d9e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into frame_fix
Conflicts:
	maps/polaris-1.dmm
	maps/polaris-5.dmm
2016-06-01 14:47:21 -04:00
SinTwo
5d25d72593 Frame Fixes 2016-06-01 14:32:56 -04:00
Datraen
a7abdb5c86 Merge pull request #1845 from Yoshax/preperationsforbigports
Scheduler now uses btime, and other improvements
2016-06-01 14:21:28 -04:00
Yoshax
927923f1bd Merge pull request #1846 from VOREStation/battfix
Readds power cells to exosuit fabs.
2016-06-01 18:36:23 +01:00
Arokha Sieyes
80706b8e90 Readds power cells to exosuit fabs. 2016-06-01 13:25:32 -04:00
Yoshax
0fb98bbabd Scheduler now uses btime, and other improvements 2016-06-01 17:56:07 +01:00
Yoshax
0fac31fad3 Fixes being able to buckle more than one mob to bucklable things 2016-06-01 16:34:07 +01:00
Yoshax
d32a708ec7 Fixes snowy overlays layering 2016-06-01 16:01:36 +01:00
Neerti
6245cbaf07 Merge pull request #1836 from Yoshax/grenadefix
Fixes box of EMP grenades only ever spawning 1 grenade
2016-06-01 00:39:10 -04:00
Neerti
3e3962c0a9 Merge pull request #1801 from Anewbe/more_hostile_mobs
PUNCH SPIDERS, GET MONEY
2016-06-01 00:37:46 -04:00
Yoshax
0777379d37 Fixes box of EMP grenades only ever spawning 1 grenade 2016-06-01 02:00:57 +01:00
Arokha Sieyes
f23035c9ed Make Exosuit Fabs Great Again
S'what I get for copypasting suggestions I guess.
2016-05-31 18:45:08 -04:00
Mechoid
7bcd041e09 Fixes overlay issue with ghosts when choosing sprites, and adds more sprites to choose from from popular demand. 2016-05-31 14:30:17 -07:00
Datraen
36d9cee0f7 Merge pull request #1806 from VOREStation/limbprinter
Make FBPs Constructable
2016-05-31 15:50:32 -04:00
Arokha Sieyes
76e4afa6d7 Fix suggested by Ginja 2016-05-31 15:38:24 -04:00
Datraen
c75512aa75 Xenobio2 Update #3 (#1832)
* Adds growth inspection to the trait scanner, lowers mutation and growth levels.

* Adds NutriMaxes to Xenobiology, for feeding the slimes.

* Fixes a typo
2016-05-31 18:30:52 +01:00
Broseph Stylin
4518e22be2 Small update to double beds. (#1828)
* Corrects a typo because I'm dumb.

* Adds double bed recipe to appropriate materials.
2016-05-31 15:08:57 +01:00
Datraen
caac4c5838 Randomized Plant Update (#1805)
* Plants now use a ban list instead of an approved.

This means that most reagents can be synthesized by plants.

Also added a name generator for strange seeds, based off of a bit of
lipsum and a bit of various plant genus and descriptors.

# Conflicts:
#	code/modules/hydroponics/seed.dm

* Removes # sign
2016-05-31 15:08:42 +01:00
Mark9013100
d7624b2b15 Adds a few more accessories 2016-05-31 06:16:05 -04:00
Datraen
c1c3110496 Xenobio2 Update
Adds the trait scanner, which I had thought was previously added.
Fixes the smartfridge not believing that it had the cores in it's inventory.
Fixes an inverted check.
2016-05-30 23:44:53 -04:00
Mark9013100
9aecdce655 Adds more ties to loadout, strangulation not included 2016-05-30 17:00:31 -04:00
Neerti
1411f6682e Merge pull request #1818 from EmperorJon/30_May_Runtime_fix_and_changelog
Fixes and changelog
2016-05-30 15:59:56 -04:00
Spades
26c759c7ad Fixes #1813 (#1815) 2016-05-30 19:57:06 +01:00
Jon
d7f1f01a35 Changelog for the past few changes plus a fix to a runtime I encountered with assistants and alt-titles. 2016-05-30 19:35:43 +01:00
EmperorJon
741706e9e3 Underwear + setup merges (#1812)
* Manually merges 12595 and 12461.

* Moron Jon 2: Moron Boogaloo

* Makes Yosh happier
2016-05-30 19:19:45 +01:00
Broseph Stylin
333603ce51 Adds working double beds. (#1807)
* Adds double beds.

* Adds double bedsheets + Ian single bedsheet.

* Adds double bedsheet sprites.

* Adds double bed sprites.

* Fixes a stupid item_state mistake.
2016-05-30 19:03:56 +01:00
Yoshax
1a203e131a Merge pull request #1792 from Neerti/5/28/2016_ling_changes
Some Changeling Changes
2016-05-30 13:53:18 +01:00
Hubblenaut
8a49ad330c Spaceheater/Recharger Power Changes
- Spaceheater now spawns with a high-capacity cell and set to 20 Kelvin.
 - Recharger now charges devices with 40 kW rather than 15 kW.
2016-05-30 13:23:58 +02:00
Arokha Sieyes
4c86fabb63 Tags. 2016-05-30 05:32:11 -04:00
Arokha Sieyes
1b9b3ba124 Update Exosuit fab and new machine to use materials system 2016-05-30 05:29:37 -04:00
Arokha Sieyes
636bcd8745 Sad that I have to do this. 2016-05-30 02:36:58 -04:00
Arokha Sieyes
2186afb094 Dem tags doe.
Closed a </span> tag I forgot.
2016-05-30 02:22:33 -04:00
Arokha Sieyes
05f8a69821 Make FBPs Constructable
Print 'em out, slap an MMI or Posibrain in. They come from a new machine, the Prosthetics Fabricator. You can order license discs from cargo to print the proprietary limbs. Making FBPs requires a bit of research as well, otherwise you only get arms/legs. Also requires a bit of plasteel to make the critical parts. Mostly just need every limb, plus eyes. Torso comes with the snowflakey FBP battery.

Also adds an FBP 'self-diagnostics' verb. More vague than an analyzer.

**This adds a machine that needs to be placed on the map. "/obj/machinery/pros_fabricator"**

Personally, I would replace the right-side exosuit fab with it. I can add this to my PR but I'm unsure how you guys feel about non-devs submitting map changes.
2016-05-30 02:13:55 -04:00
Neerti
3372d3ffee Some Changeling Changes
Bioelectrogenesis effectiveness can now be hindered by their gloves' electrical resistance.  Wearing insulated and making your hands create electricity won't be a good idea now.
Fake death is now much more real, inflicting the changeling with a large amount of oxygen damage, causing actual death, which fixes a lot of inconsistencies and bugs involving the game not checking for FAKEDEATH, as that is no longer needed with actual death.
The text received when obtaining the revive verb is now much larger, to make it easier to see.
Revival now undislocates all limbs.
Changes failure message received when you try to revive when absorbed to be consistent in style with other ling messages.
2016-05-29 21:47:50 -04:00
Datraen
eb0629add2 Merges new for MMI/Posibrains, fixes runtimes from posibrains. 2016-05-29 17:57:16 -04:00