Commit Graph

22685 Commits

Author SHA1 Message Date
Datraen
15d504eb4e Merge pull request #1626 from Yoshax/weaponupdate
Weapon sharpness and edge adjustments
2016-05-12 22:00:06 -04:00
Datraen
835a719351 Merge pull request #1639 from Yoshax/clickcase
Adds click cooldown to display case
2016-05-12 21:59:13 -04:00
Datraen
19c89532d2 Merge pull request #1627 from Yoshax/lights
Lights changes and additions
2016-05-12 21:58:52 -04:00
Datraen
32f35bcc88 Merge pull request #1638 from Anewbe/unathi_chem_changes
Unathi Chem Changes - Sledge Approved
2016-05-12 21:57:27 -04:00
Yoshax
804fc11d0a Brain damage no longer prevents implant removal surgery 2016-05-13 02:01:46 +01:00
Yoshax
939073a0d2 Adds click cooldown to display case 2016-05-13 01:34:19 +01:00
Anewbe
45b888fbfb Alters Unathi biology 2016-05-12 19:08:23 -05:00
PsiOmegaDelta
a6dd6bfa4a Ports Bay's adjustments of the faux-nanoui character setup and related 2016-05-12 18:26:24 +01:00
Yoshax
7fe2150d3f Removes a stray character 2016-05-12 16:36:09 +01:00
HarpyEagle
d3aacce795 Animation and cooldown only come into effect if the flash is actually used 2016-05-12 16:31:07 +01:00
HarpyEagle
7d64004c47 Improves lightswitch lighting
Now only the light part layers over darkness, and the light provided
is appropriately dim.
2016-05-12 16:26:56 +01:00
Datraen
9e116ea887 Merge pull request #1625 from Yoshax/vendingmachines
Vending machine changes and fixes
2016-05-12 11:23:25 -04:00
HarpyEagle
8079b34a27 Updates flashbangs and flash/flare rounds to take advantage of new lighting.
Main improvement is somewhat brighter flashes, coloured flares.
2016-05-12 16:21:39 +01:00
Yoshax
e2c66a3bf2 Weapon sharpness and edge adjustments 2016-05-12 16:13:41 +01:00
HarpyEagle
8f659e2263 Adds a sleep(3) between the vending of two items for effect. 2016-05-12 15:57:23 +01:00
GinjaNinja32
5490c15274 fix vending machine message 2016-05-12 15:54:37 +01:00
PsiOmegaDelta
d8e719b435 Vending machines now clear the coin var on qdel.
Fixes #12725.
2016-05-12 15:54:09 +01:00
PsiOmegaDelta
825add164c Fixes vending machines not throwing their items.
get_product() did not properly return the requested product.
2016-05-12 15:53:28 +01:00
PsiOmegaDelta
75629504fd Vending machines now store actual object instances.
These instances are not initialized until someone first adds or removes a product.
The last added item is the first item to be removed.
This prevents cases were you could insert half-eaten chocolate and get back a full bar, for example.
2016-05-12 15:52:46 +01:00
Yoshax
6b6fb4a6ca Makes blue carpet and AI floor removable 2016-05-12 14:54:40 +01:00
Neerti
cb5d2db7b9 Merge pull request #1621 from Datraen/FakeNanoUI-More
Brings New Player Manifest, Load Slot into FakeNanoUI.
2016-05-12 00:39:44 -04:00
Datraen
16366b8e3d Brings New Player Manifest, Load Slot into FakeNanoUI. 2016-05-12 00:14:23 -04:00
Neerti
e2862ff083 Merge pull request #1616 from Anewbe/ai_languages
AI Language tweaks
2016-05-11 22:40:18 -04:00
Datraen
761ea91a70 Changes the colors of the occupation setup tab. 2016-05-11 21:14:33 -04:00
Anewbe
ea8d63e9fd Adds Siik'Maas and Schechi to AI language list 2016-05-11 18:06:57 -05:00
Yoshax
fa8bb179bf Fixes #1586 2016-05-11 17:17:43 +01:00
Datraen
4456f77d75 Merge pull request #1551 from Zuhayr/master
Makes slime people more interesting and thematic.
2016-05-11 02:34:50 -04:00
Datraen
5afebdbf27 Merge pull request #1603 from Anewbe/borg_languages
Fixes borg languages
2016-05-11 02:27:58 -04:00
Neerti
cb08c07cf2 Merge pull request #1602 from redstryker/master
Adds Glowsticks
2016-05-11 02:00:51 -04:00
Neerti
021fc36f9f Merge pull request #1587 from Anewbe/borg_armor_boost
Borg Armor Tweak
2016-05-11 01:58:42 -04:00
Neerti
861c9d7fdc Merge pull request #1560 from Yoshax/emagupgrade
Adds the ability to feed telecrystals to emags for more uses
2016-05-11 01:55:12 -04:00
Neerti
84d389a0c7 Merge pull request #1479 from Yoshax/limbfixes
Wound Changes + Fixes + Medical Changes
2016-05-11 01:53:58 -04:00
Datraen
e7b563ee01 Merge pull request #1593 from VOREStation/fakenano-setup
New Player/Character Setup (Fake)NanoUI
2016-05-11 01:53:04 -04:00
Neerti
b65ed00b5f Merge pull request #1415 from Hubblenaut/reinf
Reinforced Walls
2016-05-11 01:52:46 -04:00
Datraen
3fb4620199 Merge pull request #1395 from ParadoxSpace/BuffsAdminGuns
Buffs Back Pulse Rifles
2016-05-11 01:51:13 -04:00
Neerti
3dd6afe8af Merge pull request #1604 from silveryferret/no_roundstart_report
Removes the "Subversive Elements" Cent. Com. report at roundstart
2016-05-11 01:41:20 -04:00
EmperorJon
d869a52c4e Merge pull request #1599 from Yoshax/mercitemfixes
Removes antag limitations on uplink items to make them actually buyable
2016-05-09 15:52:39 +01:00
silveryferret
a9c65176dd Removes the "Subversive Elements" Cent. Com. report
As title.
2016-05-09 09:45:53 -05:00
Datraen
c192d9551f Merge pull request #1568 from Yoshax/doublechance
Adds the ability for vending machines to vend 2 items with a 1% chance
2016-05-09 08:39:03 -04:00
Anewbe
4b1e5c1de5 Fixes borg languages 2016-05-08 22:58:21 -05:00
redstryker
8b5ed3d7ff Adds Glowsticks 2016-05-08 18:22:15 -04:00
Arokha Sieyes
4f7aba8b27 Panel closes on latejoin
Sure would be nice if that panel went away when you latejoin.
2016-05-08 17:06:53 -04:00
Yoshax
79b1bf5260 Removes antag limitations on uplink items to make them actually buyable 2016-05-08 22:03:17 +01:00
Arokha Sieyes
5692ad76ad Removed imaginary </style> tag from previous work 2016-05-08 14:20:18 -04:00
Datraen
d476cac4f0 Merge pull request #1598 from Yoshax/gamemodesecretcosts
Swaps secret player count for ninja/wizard and ninja&wizard
2016-05-08 11:21:10 -04:00
Datraen
0031f4f065 Merge pull request #1597 from Yoshax/drinkinglasses
Gives drinking glasses a material so they have a cost in autolathe
2016-05-08 11:18:24 -04:00
Yoshax
f9708a2e0e Swaps secret player count for ninja/wizard and ninja&wizard 2016-05-08 16:05:07 +01:00
Yoshax
e2293f1e79 Gives drinking glasses a material so they have a cost in autolathe 2016-05-08 15:51:16 +01:00
Yoshax
30bcf94067 Removes for loop and adjusts code 2016-05-08 12:41:38 +01:00
Arokha Sieyes
45e9b4f10a Removed earlier attempt at color 2016-05-08 03:22:33 -04:00