ZomgPonies
4e7cccffad
Merge pull request #1203 from TheDZD/minor-fixes
...
Fixes Shadowling Intercept
2015-05-28 16:24:38 -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
ZomgPonies
52e8720bd8
Merge pull request #1195 from Fox-McCloud/wolpin-fix
...
Wolpin Fix+Monkey Tail Fix
2015-05-28 12:34:17 -04:00
Fox-McCloud
226052c438
typo
2015-05-28 04:07:41 -04:00
Fox-McCloud
cd112b5364
Wolpin Fix+Monkey Tail Fix
2015-05-28 04:04:39 -04:00
Krausus
460fccd8db
Fixes syringe blood duping
2015-05-27 21:56:01 -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
ZomgPonies
7845127f34
Merge pull request #1187 from TheDZD/minor-fixes
...
Fix for custom items not spawning
2015-05-27 20:05:46 -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
c024764b10
Merge pull request #1179 from TheFlagbearer/revert-1158-Theflagbearer-customitems
...
The Flagbearer - Custom Item Fixes
2015-05-27 19:39:58 -04:00
ZomgPonies
57cb6a8ca5
Merge pull request #1178 from TheDZD/mobs
...
simple_animal and simple_animal/hostile Refactor
2015-05-27 19:38:50 -04:00
ZomgPonies
0587051c79
Fixes monkey inventory stuff
2015-05-27 19:29:17 -04:00
DZD
4407f58aa4
Fix for custom items not spawning
...
The jobmask wasn't trimming spaces after the comma between job names,
and thus thought every job after the first began with a space.
2015-05-27 19:10:43 -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
DZD
db863b258d
Minor bear fixes
...
Fixes bears not having attack text or an attack sound.
2015-05-27 18:22:03 -04:00
FalseIncarnate
5f39924db4
Delete monkey/diona.dm
...
Exorcises the nymph code haunting my repo.
2015-05-27 01:26:57 -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
ZomgPonies
d5f7f49c08
Merge pull request #1177 from Fox-McCloud/laserrrrzzzz
...
Researchable Surgical Tools Port
2015-05-26 22:21:10 -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
a3d29eec2f
Fix for languages using 2 characters in prefix
2015-05-26 21:38:10 -04:00
TheFlagbearer
b24c1a783f
Item sprites and defines
...
Fixes the Arachno-Man items. Hopefully doesn't cause a merge conflict.
If it does, I'll be forced to leave this PR open until someone helps out
or it's closed by a Senior Admin.
2015-05-26 21:32:42 -04:00
ZomgPonies
e76e33f4eb
Fixed language keys for monkeys
2015-05-26 21:30:13 -04:00
ZomgPonies
1aa5a8533d
Cleanup and moving of species files
2015-05-26 21:21:37 -04:00
ZomgPonies
a9e2f0c641
HUD fixes
2015-05-26 21:13:02 -04:00
Tigercat2000
2d87dbcb13
Fix getPixelDistance()
2015-05-26 18:08:32 -07:00
DZD
93419f7fd4
simple_animal and hostile mob refactor
...
Ports the following:
tgstation/-tg-station#1780
Part of tgstation/-tg-station#6278 (Not including faction transferring)
tgstation/-tg-station#8206
tgstation/-tg-station#8543
2015-05-26 20:30:32 -04:00
ZomgPonies
0cc15105e5
Final fix
2015-05-26 20:29:47 -04:00
ZomgPonies
32c00989d6
Tigercat's fixes
2015-05-26 20:26:26 -04:00
ZomgPonies
86ebb33c7e
fix monkey language keys
2015-05-26 20:18:43 -04:00
ZomgPonies
be68965578
Fix pun pun runtimes also fixes for datums not initializing before world
2015-05-26 20:15:53 -04:00
Fox-McCloud
9e4af78603
tweaks
2015-05-26 20:06:42 -04:00
ZomgPonies
4f9b90a53f
Merge pull request #1176 from veganzombeh/fix
...
Prevents ghosts with antagHUG enabled becoming golems.
2015-05-26 19:29:28 -04:00
Fox-McCloud
f6058e9c50
Researchable Surgical Tools Port
2015-05-26 18:52:09 -04:00
TheFlagbearer
a483ba4145
Revert "Custom Items - The Flagbearer"
2015-05-26 18:33:41 -04:00
veganzombeh
d195c5bd63
Prevents ghosts with antagHUG enabled becoming golems.
...
Prevents ghosts with antagHUG enabled becoming golems. Also adds a message for ghosts with ineligible ghosts attemping to become golems and fixes a typo.
2015-05-26 23:24:18 +01:00
ZomgPonies
bd3c29fc84
Fixed monkey health
2015-05-26 14:25:05 -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
595c9de192
Merge pull request #1173 from Fox-McCloud/spess-dog-fix
...
Vulpkanin Facial Fur Fix
2015-05-26 00:26:29 -04:00
ZomgPonies
264369bdfa
issmall fixes and order of operations
2015-05-25 23:50:53 -04:00
Fox-McCloud
64d2d5c092
Vulpkanin Facial Fur Fix
2015-05-25 21:48:08 -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
