Commit Graph

22199 Commits

Author SHA1 Message Date
Fox-McCloud
5f2f3f6789 Merge pull request #1343 from tigercat2000/DidntIsayIamGoingtoStopThisstuff
Window spawners + Adding to map
2015-06-19 22:19:37 -04:00
Fox-McCloud
d121ccfc76 Fox--Custom Items 2015-06-19 22:18:22 -04:00
Fox-McCloud
a5bb2ed77a Merge pull request #1348 from Krausus/CultIconRemovalFix
Fixes Cult Icon Removal, Probably
2015-06-19 14:41:38 -04:00
Krausus
113ef6b211 Fixes cult icon removal runtiming, probably 2015-06-19 10:53:34 -04:00
ZomgPonies
05826a8ad9 Merge pull request #1340 from Fox-McCloud/objectives
Objective Tweaks
2015-06-19 08:25:09 -04:00
ZomgPonies
3947ff9bbc Merge pull request #1335 from Fox-McCloud/resizing
Codebase Size Reduction--Music
2015-06-19 08:24:27 -04:00
Tigercat2000
d7e9c36474 Clean up window coloring code a bit. Also makes windowspawners only create
windows where needed, not everywhere then deleting the ones it doesn't
want.
2015-06-18 19:58:08 -07:00
Fox-McCloud
b10ea269ef bless fix 2015-06-18 18:04:37 -04:00
Fox-McCloud
ada66fabd4 Update II 2015-06-18 17:47:52 -04:00
TheDZD
57bba9e085 Merge pull request #1345 from ZomgPonies/presidente
Fixes Diplomatic Uniform
2015-06-18 16:45:58 -04:00
ZomgPonies
b2e821ebb0 Fixes fancy uniform 2015-06-18 16:24:04 -04:00
Tigercat2000
654cb37e9a Window spawners + Adding to map
This commit adds window spawners, mapping tools which either spawn full
windows or automatically detect where it should place each pane.
2015-06-18 12:33:12 -07:00
ZomgPonies
a785f93de4 Merge pull request #1341 from Krausus/APCGetAndFrameFixes
Fixes get_apc and a mountable frame issue
2015-06-18 06:09:20 -04:00
Krausus
4ba0f72406 Fixes mountable frames checking their area wrong 2015-06-18 05:05:28 -04:00
Krausus
c0075f41d0 Fixes get_apc with a BYOND bug workaround
Also reverts the mining asteroid-specific workaround
2015-06-18 04:54:31 -04:00
Fox-McCloud
97ae66260c Objective Tweaks 2015-06-18 02:04:44 -04:00
Fox-McCloud
36b7e7b233 Merge pull request #1333 from SamCroswell/NinjaDev
EKatana Changes, Removes Ninja Eye Implant
2015-06-18 01:02:17 -04:00
SamCroswell
192b568d6c Re-Submission of a352f2c 2015-06-18 00:27:03 -04:00
SamCroswell
e8e8f2e6df Temporary Revert of a352f2
This reverts commit a352f2c5c2.
2015-06-18 00:18:13 -04:00
Fox-McCloud
cbc9458379 Merge pull request #1331 from TheBeoni/Brig-Phys
Brig Doctor Jumpsuit.
2015-06-17 23:02:06 -04:00
Fox-McCloud
0bf82e47ec Merge pull request #1337 from tigercat2000/TravisUpd
Update travis.yml to use BYOND 508.1289
2015-06-17 20:24:03 -04:00
Fox-McCloud
8fa15c28a4 Merge pull request #1338 from tigercat2000/apcfixes
Fixes APC try_build
2015-06-17 20:23:18 -04:00
Tigercat2000
372801fc97 Fixes APC try_build 2015-06-17 16:39:03 -07:00
Tigercat2000
16dfc3a1a6 Update travis.yml to use BYOND 508.1289 2015-06-17 15:46:32 -07:00
Fox-McCloud
83fb1a4bab Codebase Size Reduction--Music 2015-06-17 18:14:14 -04:00
ZomgPonies
8d2a0598a1 Merge pull request #1334 from Fox-McCloud/actual-removal
Removes Phallic Icons
2015-06-17 16:55:07 -04:00
Fox-McCloud
91e1a39cb8 Removes Phallic Icons 2015-06-17 16:36:32 -04:00
TheDZD
2a3183dc05 Merge pull request #1320 from ZomgPonies/graffiti
Adding new graffiti types
2015-06-17 16:15:21 -04:00
ZomgPonies
17f2a231c8 Removes genitalia from graffiti 2015-06-17 12:22:29 -04:00
SamCroswell
a352f2c5c2 Removes Ninja Eyewear 2015-06-17 00:49:41 -04:00
SamCroswell
1f18dcd2d1 Updates Katana Code 2015-06-17 00:42:57 -04:00
SamCroswell
cf59967c86 Adds EKatana Belt Icon 2015-06-17 00:07:02 -04:00
Fox-McCloud
75e68e618d Merge pull request #1325 from Nienhaus/master
Adds Deer ;D
2015-06-16 21:18:06 -04:00
TheBeoni
fd4c40fcf9 Added brig physician jumpsuit. Brig Physician spawns with one, i also put one spare into locker. 2015-06-17 02:11:01 +02:00
Fox-McCloud
3939d46f8a Merge pull request #1329 from TheBeoni/Misspelt-Blueshield
Blueshied to Blueshield Fix.
2015-06-16 18:34:02 -04:00
Fox-McCloud
4c3c38189e Merge pull request #1328 from FalseIncarnate/master
[Fix] Diona Nymph runtime and Fruit Attack fixes
2015-06-16 17:40:15 -04:00
TheBeoni
5b376bcf76 Blueshied to Blueshield Fix.
I misspelt Blueshield for Blueshied so i am ashamed.
2015-06-16 23:34:01 +02:00
FalseIncarnate
3166200c5e Diona Nymph runtime and Fruit Attack fixes
Fixes a runtime preventing Diona Nymphs from eating weeds and regaining
nutrition

Fixes fruit attacks checking for "hurt" when they should check for
"harm".
- You can now smack people with fruit on harm intent. If the plant has
TRAIT_STINGS, it will inject them with it's chemicals
- You can now crush a fruit in your hand on harm intent to destroy it
(will not leave trash like banana peels!). This will trigger the same
effects that throwing the fruit would have, except without needing to
throw it.
- Use this to activate that smoke-screen tobacco you spent all round
mutating, or to make a quick escape with your bluespace tomato!
2015-06-16 17:09:39 -04:00
Fox-McCloud
ed6f675ffb Merge pull request #1321 from ZomgPonies/elpresidente
Adds in new fancy uniform for events
2015-06-16 16:30:48 -04:00
ZomgPonies
5ce71d8cd7 Merge pull request #1319 from Fox-McCloud/best-objective-ever
Fixes Lazy Syndicates
2015-06-16 08:02:35 -04:00
ZomgPonies
b5bf126222 Merge pull request #1317 from Fox-McCloud/lampsssss
Moveable Desklamps
2015-06-16 08:02:27 -04:00
ZomgPonies
a762306163 Merge pull request #1316 from Fox-McCloud/teleport-fix
Updates+Fixes Teleport Datum
2015-06-16 08:02:21 -04:00
ZomgPonies
e0401ee948 Merge pull request #1315 from Fox-McCloud/explosion-optimization
Optimizes Explosions
2015-06-16 08:02:15 -04:00
ZomgPonies
2879590f76 Merge pull request #1314 from Fox-McCloud/powernet-tweaking
Powernet Tweaks
2015-06-16 08:02:10 -04:00
Nienhaus
061a484016 Makes deer dead sprite upside down. 2015-06-15 19:50:53 -05:00
Nienhaus
060318cb29 Adds Deer ;D 2015-06-15 18:50:39 -05:00
ZomgPonies
f311f91e8c Merge pull request #1322 from Krausus/Fixes-201506150815
Fixes One-Click Wizard and Runtimes
2015-06-15 11:25:31 -04:00
ZomgPonies
9a6ac0e44a Adds in new fancy uniform for events 2015-06-15 11:05:06 -04:00
Krausus
66506d9049 Fixes Make Wizard and timed alerts
Turns out timed alerts, which are ONLY used by Make Wizard, were broken
ever since they were added... 11 months ago. Now they work, so Make
Wizard works.
2015-06-15 11:03:23 -04:00
ZomgPonies
f92c1d7beb Adding new graffiti types 2015-06-15 10:24:56 -04:00