Commit Graph

9304 Commits

Author SHA1 Message Date
ZomgPonies
16aff7c7ff Merge pull request #1236 from Fox-McCloud/grenade-hands
Adds Grenade, Flash, and EMP in-hands
2015-06-01 15:19:59 -04:00
Tigercat2000
b1dc47b4df Fix incorrect uses of the shuffle proc.
Even before the -tg- proc port, it didn't do inline modification of the list.
2015-06-01 08:23:31 -07:00
Fox-McCloud
866de52f0f SNIP 2015-05-31 22:32:20 -04:00
Fox-McCloud
bbed6a2a42 Refactors Barsigns 2015-05-31 20:04:12 -04:00
Fox-McCloud
e71bcdb9d0 Adds Grenade, Flash, and EMP in-hands 2015-05-31 16:39:41 -04:00
Aranclanos
58339aaee8 Malf factory-builder overlay.
Added an overlay for the AI when she tries to spawn a robotic factory so
the user gets some feedback of where they are building.

Fixes numerous exploits to spawn several factories.
Fixes tgstation/-tg-station#1259
2015-05-31 09:32:42 -07:00
Fox-McCloud
e098364432 Stun+Weaken Balancing 2015-05-31 06:35:14 -04:00
ZomgPonies
e5f026d02e Merge pull request #1216 from tigercat2000/OHGODIHAVETOTESTTHIS
Port Atlas's implementation of -tg-'s canvas art.
2015-05-30 20:17:41 -04:00
ZomgPonies
c0406687e0 Merge pull request #1215 from tigercat2000/Necastuff
Disable enemy-intercept and automatic code blue, by request of Necaladun.
2015-05-30 15:02:11 -04:00
Fox-McCloud
7a8a258a87 Merge pull request #1226 from Krausus/Fixes-201505300219
Various Minor Fixes
2015-05-30 07:00:48 -04:00
Krausus
f84e7e8e8d Fixes losing items when dismantling machine frames 2015-05-30 06:25:46 -04:00
Fox-McCloud
0602435d8a Fixes and Tweaks to Defenses 2015-05-30 01:47:25 -04:00
ZomgPonies
01896f9209 Merge pull request #1208 from tigercat2000/coloredtilelight
Colored Light Tiles
2015-05-29 19:36:56 -04:00
Tigercat2000
cced767094 Port Atlas's implementation of -tg-'s canvas art. 2015-05-29 15:43:42 -07:00
ZomgPonies
e7f38b2e5c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into chingchong
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
2015-05-29 17:53:07 -04:00
Tigercat2000
cb7a180b6e Disable intercept and auto-blue-alert.
This PR Temporarily disables the intercept and automatic-blue-alert until
the system can properly be removed.
2015-05-29 10:17:44 -07:00
ZomgPonies
ab3267f897 Merge pull request #1213 from Krausus/AirFixes-201505290432
Minor Atmos Fixes
2015-05-29 12:37:40 -04:00
Krausus
6273700c7a Fixes Job Randomization Exclusions 2015-05-29 08:44:27 -04:00
Krausus
778f928e6b Fixes canisters not exciting the air when broken 2015-05-29 05:11:57 -04:00
Krausus
c8ea42f8f7 Fixes tiles not updating their air when deleted
Also, reverts a workaround that was necessary to compensate for this
bug.
2015-05-29 04:40:17 -04:00
ZomgPonies
277a900aa7 Merge pull request #1193 from Fox-McCloud/mobs-pets-stuffs
Simple Animal Refactor+Update+Fixes and Pet Collars
2015-05-28 22:45:03 -04:00
Tigercat2000
f7ccb2ef79 Colored Light Tiles
Light tiles (item) can now have their color changed by attacking them with a
multitool. These colors have special sprites and glow a color similar to
their sprite.
2015-05-28 16:52:06 -07:00
ZomgPonies
4e7cccffad Merge pull request #1203 from TheDZD/minor-fixes
Fixes Shadowling Intercept
2015-05-28 16:24:38 -04:00
ZomgPonies
15cfa99edc Adds chickenman and clown statues 2015-05-28 15:55:55 -04:00
DZD
7f9952961f Fixes Shadowling Intercept
This was being sent once for every shadowling, oops.
2015-05-28 15:54:05 -04:00
Fox-McCloud
80c75fa216 Merge pull request #1201 from ZomgPonies/monkey
Monkey Fixes #2
2015-05-28 14:20:34 -04:00
ZomgPonies
584455da65 Fixes monkeys still dropping their organs 2015-05-28 13:02:22 -04:00
Fox-McCloud
cd112b5364 Wolpin Fix+Monkey Tail Fix 2015-05-28 04:04:39 -04:00
Fox-McCloud
5d3e837b4a Mob Refactor+Update and Pet Collars 2015-05-28 00:20:25 -04:00
ZomgPonies
e2f867e896 Merge pull request #1189 from Fox-McCloud/squeaky
Fixes Rubber Duck
2015-05-27 20:27:27 -04:00
Fox-McCloud
93935bd315 Merge pull request #1185 from ZomgPonies/monkey
Monkey Fixes
2015-05-27 20:09:06 -04:00
Fox-McCloud
f87c819d25 heheh 2015-05-27 20:02:22 -04:00
Fox-McCloud
127aff20ba Fixes Rubber Duck 2015-05-27 19:55:35 -04:00
ZomgPonies
0587051c79 Fixes monkey inventory stuff 2015-05-27 19:29:17 -04:00
ZomgPonies
fc8a5b8789 Fixed invisible nymphs and monkey recyclers 2015-05-27 19:02:16 -04:00
ZomgPonies
8dc5dd1431 Fixes monkeyblock genetics stuff 2015-05-27 18:32:11 -04:00
FalseIncarnate
a1cce51559 Merge Conflict Fix, Attempt 2 2015-05-27 01:07:19 -04:00
FalseIncarnate
28347540b6 Merge Conflict Fix
Because Ponies removed commented out code.
2015-05-27 00:57:57 -04:00
Fox-McCloud
710dd1b520 Merge pull request #1171 from ZomgPonies/monkey
Converting monkeys to human subtypes
2015-05-26 22:14:55 -04:00
ZomgPonies
a9e2f0c641 HUD fixes 2015-05-26 21:13:02 -04:00
ZomgPonies
0cc15105e5 Final fix 2015-05-26 20:29:47 -04:00
ZomgPonies
5c79a9a065 Small object manipulation stuff 2015-05-26 14:00:20 -04:00
FalseIncarnate
c385cb7f4f Botany Belt, Biogenerator Additions
Adds in the new Botany Belt, a belt designed for handling all sorts of
botany-related tools.

Adds the Botany Belt, Security Belt, Medical Belt, Janitor Belt, and
Bandolier to the Biogenerator's list of products.

Re-arranges the biogenerator's product listing to have a new "Belts"
section, dedicated to (you guessed it) belts.
- Moves the Utility (tool) into the Belts section, previously was in the
Leather section
- The new belt listings are also in this section.

All belts in the biogenerator have the same base cost of 300 points.
Increasing the efficiency of the machine will lower the costs
appropriately.

Adjusts some code related to the security belt so they won't magically
have a seclite in them when created via biogenerator.
- The belts in the sec lockers will still have their light
- The ERT belt no longer needs to clear contents during its New() proc
to remove the seclite.
2015-05-26 13:54:24 -04:00
ZomgPonies
264369bdfa issmall fixes and order of operations 2015-05-25 23:50:53 -04:00
ZomgPonies
fa5e97deb5 Missing dmis, final fixes 2015-05-25 20:35:35 -04:00
ZomgPonies
e056abfb82 3/3 port done 2015-05-25 20:16:34 -04:00
ZomgPonies
1935a82afe 2/3 of port done 2015-05-25 19:48:13 -04:00
ZomgPonies
f2d03e93c2 First 1/3 of port done. 2015-05-25 17:59:30 -04:00
FalseIncarnate
b20d004142 Biogenerator Biomass Value Fix
Fixes the Biogenerator only giving one point of biomass per product
inserted.

The biogenerator previously calculated the points based on the amount of
the nutriment reagent in the products inserted.

Now the biogenerator will calculate the points based on the combined
amounts of the nutriment and plant-matter reagents in the product.

Overall, this just restores the values back to their pre-Nutrient
Changes levels, as nutriment in plant products was replaced with
plant-matter for nearly every plant that had it.
2015-05-25 15:20:58 -04:00
TheDZD
40d165d9c5 Merge pull request #1165 from Krausus/Fixes-201505250443
Fixes: Mulebots, Catwalks, Flashbangs, Diona Suicide, Traitor Report, Challenge, Runtimes, etc.
2015-05-25 11:20:29 -04:00