Aurorablade
b72f011f8a
Closer,
...
need to figure out inhand/on head icon states.
2015-06-24 01:19:54 -04:00
Aurorablade
154d040d5d
Assuming direct control...almost
2015-06-23 18:51:11 -04:00
Aurorablade
a976e1ae7a
stupid mousedrop
2015-06-23 00:35:33 -04:00
Aurorablade
03c801f855
Eeeeeeeee
2015-06-22 11:51:46 -04:00
Aurorablade
103010e9bd
i am over my head
...
but will keep this branch up for now.
2015-06-22 07:27:30 -04:00
Aurorablade
9a0f518ebc
Boop
2015-06-21 15:44:43 -04:00
PJB3005
d0f32728cd
Whatever the hell an underf is, it's gone now
2015-06-20 16:32:31 +02:00
PJB3005
320e481677
Alright
2015-06-20 16:22:51 +02:00
PJB3005
e068fabdb4
In which I unfuck Life()...
...
SLIGHTLY.
2015-06-20 14:47:54 +02:00
PJB3005
8ad74ebb6e
Fixes all your problems...
...
Except the fact that 75% of paradise is still using del, and you have no pooling.
Or defer_powernet_rebuild, do you guys have that yet?
2015-06-20 14:47:45 +02:00
ZomgPonies
3947ff9bbc
Merge pull request #1335 from Fox-McCloud/resizing
...
Codebase Size Reduction--Music
2015-06-19 08:24:27 -04:00
ZomgPonies
b2e821ebb0
Fixes fancy uniform
2015-06-18 16:24:04 -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
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
83fb1a4bab
Codebase Size Reduction--Music
2015-06-17 18:14:14 -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
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
b5bf126222
Merge pull request #1317 from Fox-McCloud/lampsssss
...
Moveable Desklamps
2015-06-16 08:02:27 -04:00
ZomgPonies
2879590f76
Merge pull request #1314 from Fox-McCloud/powernet-tweaking
...
Powernet Tweaks
2015-06-16 08:02:10 -04:00
Nienhaus
060318cb29
Adds Deer ;D
2015-06-15 18:50:39 -05: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
Krausus
7aa8c06e6c
Fixes runtime when add_reagent-ing 0 of something
...
On rare occasions, something will try to add 0 of a reagent, which would
cause problems.
2015-06-15 10:10:26 -04:00
Krausus
43578f8172
Fixes one-click-antag runtimes
...
Should make one-click-wizard stop breaking unpredictably.
2015-06-15 09:58:23 -04:00
Krausus
ea34114321
Fixes protolathe stack-inserting runtime
2015-06-15 08:52:53 -04:00
Krausus
094e3e24cc
Fixes HUDType runtimes
2015-06-15 08:22:05 -04:00
Fox-McCloud
bea4974d72
Moveable Desklamps
2015-06-14 22:34:04 -04:00
Fox-McCloud
3f70dc58d6
Powernet Tweaks
2015-06-14 17:21:01 -04:00
Fox-McCloud
8a78887ba6
Blueshield Jacket Re-submission
2015-06-14 14:23:55 -04:00
ZomgPonies
200a948fc9
Merge pull request #1308 from Robertha89/master
...
Ads xeno fat suit
2015-06-14 04:55:14 -04:00
ZomgPonies
b2f0cc8deb
Merge pull request #1297 from Fox-McCloud/rip-emag-rng
...
Removes Emag RNG on APCs
2015-06-14 04:54:32 -04:00
Robertha89
662a101bce
adds xeno fat suit
2015-06-14 09:12:40 +02:00
Fox-McCloud
5db85679cc
Singulo Optimization
2015-06-14 00:31:11 -04:00
ZomgPonies
b3a585172a
Merge pull request #1302 from FalseIncarnate/master
...
[High Priority][Fix] Removes Collars from the Cargo Merch Store
2015-06-13 04:31:02 -04:00
FalseIncarnate
cc0058f789
Removes Collars from the Cargo Merch Store
...
Removes them from the merch store, since they can be purchased MUCH
cheaper at the CritterCare vendor. The only advantage to them being here
is not needing to restock and the box you get with it.
2015-06-13 04:22:13 -04:00
ZomgPonies
f70106a344
Merge pull request #1295 from FalseIncarnate/master
...
[Feature][Sprites][Map Edit] Aquariums and Pet Rocks!
2015-06-13 04:21:07 -04:00
ZomgPonies
bb02973e49
Merge pull request #1288 from Fox-McCloud/singularity-OOP
...
Singularity and Narsie Refactor
2015-06-13 04:18:40 -04:00
ZomgPonies
ce58ae99e1
Merge pull request #1300 from Fox-McCloud/Hos-laserzzz
...
HoS Lasergun Fix
2015-06-13 04:17:41 -04:00
FalseIncarnate
25b9283717
Feedback Fixes
...
Changes instances of \red and \blue to use spans as per suggestions in
glass.dm and fishtank.dm
Fixed a mistake preventing the building of one direction windows and
fishbowls (whoops!)
Fixes grammar concerns in multiple messages
Holy water is now (magically?) worth 110% of it's reagent amount when
filling aquariums.
- This is a rather small boost to having the chaplain bless the water
you are going to dump into a filtration system anyways.
Moves the fishwater ingestion method out of the on_mob_life proc to
prevent spam, now will display when initially ingested
Updates the CritterCare vendor's sprite to include the pug and fox, as
well as adjusting the "static" between displays to give it a slight
variety.
2015-06-13 04:13:47 -04:00
Fox-McCloud
e203a7d17f
HoS Lasergun Fix
2015-06-13 03:53:07 -04:00