Commit Graph

1087 Commits

Author SHA1 Message Date
Aurorablade
3aa3c942d1 FiXes CaPs
Makes the claiber type match the ammo type so it loads correctly in cap guns
2019-01-10 01:21:11 -05:00
variableundefined
a1f9a19fe2 Merge pull request #10557 from datlo/clownwiz
Adds the Staff of Slipping and Clown wizard outfit
2019-01-09 17:59:08 +08:00
Kyep
bf9d0b088f merge conflict fix, reset map 2019-01-07 16:37:07 -08:00
variableundefined
18881b2592 Merge pull request #10595 from AzuleUtama/caneDartChange
Mime's Cane Shotgun ammo reworked and buffed
2019-01-06 16:19:15 +08:00
AzuleUtama
fb052938c8 Cane shotgun darts more effective + other changes 2019-01-05 01:41:39 +00:00
Kyep
0567eab562 Merge branch 'sol_trader_update' of https://github.com/Kyep/Paradise into sol_trader_update 2019-01-03 14:40:07 -08:00
datlo
040cb89ff4 change hitsound to bike horn 2019-01-01 21:58:17 +00:00
datlo
c37b22c00b replace placeholder sprite
oops
2019-01-01 21:23:41 +00:00
datlo
7294ce4584 Removed hitsound, added wizzclown specie sprites 2018-12-30 19:06:57 +00:00
datlo
5b92bdd66d Add staff of slipping (placeholder sprites) 2018-12-30 16:54:16 +00:00
joep van der velden
1b5322c32e Refactor a few small things to make my research level parser work and make the code less odd 2018-12-30 15:18:00 +01:00
Kyep
46acb9338b sunglasses, seeds, KA, IMS, fleshy 2018-12-22 14:16:25 +00:00
variableundefined
07769ba3b9 Merge pull request #10438 from Aurorablade/BirdisnotbirdisnotBIRD
Trying to Diagnose rsc issues
2018-12-12 13:28:55 +08:00
AzuleUtama
8284c56c54 Fixes bulldog and c20's low ammo alarms only going off once 2018-12-12 00:28:45 +00:00
Aurorablade
87f3a7c1b3 Caseing 2018-12-10 21:52:10 -05:00
lass9030
b4914464d7 action icon 2018-12-09 15:08:29 +01:00
datlo
2c3541b95f Fix a couple of finger gun issues 2018-11-25 19:04:53 +00:00
variableundefined
d283cd1b4b Merge pull request #10317 from datlo/advancedmimery
Adds the advanced mimery kit to mime uplink
2018-11-25 08:51:31 +08:00
variableundefined
328a2d3dcb Merge pull request #10283 from Ty-Omaha/reflector-blob
Adds/ports modified reflective blobs
2018-11-24 08:28:37 +08:00
Ty-Omaha
cb8bc0f34d reflector blobs 2018-11-23 11:19:55 -05:00
AzuleUtama
ff92a43bcf cleaned it up a bit 2018-11-23 10:45:37 +00:00
AzuleUtama
4bea51027b Overall fix for projectile falloff
Aims to fix the overall issue of damageless projectiles not working under the new falloff code.  Also fixed some weird indentation in the original version of the range() code.
2018-11-23 10:23:38 +00:00
datlo
a80efa4924 Add the advanced mimery kit to mime uplinks
Also adds :
Mime specific spellbooks
TG wizard forcewall (mime is a subtype, will implement for wiz later
probably)
Fake finger gun spellbook in arcade
2018-11-23 07:23:34 +00:00
AzuleUtama
0332e946f6 Made laser tag guns work again
dear god what have i done
2018-11-22 01:25:16 +00:00
Ty-Omaha
2ce52aa2fe ricochet and stuff 2018-11-21 10:50:45 -05:00
TDSSS
92991726ec Moved silencers, gave them their own folder 2018-11-19 09:52:25 +01:00
Gwydion Brain
f3eaed5606 woop woop woop 2018-11-15 19:18:50 -08:00
AzuleUtama
0c59000df1 made stamina dropoff check actually work - cleaned up code
Based on reviewer's comments.
2018-11-15 09:06:19 +00:00
AzuleUtama
b790261d8d Quick change to tile_dropoff if statement should there be no dropoff 2018-11-14 22:10:56 +00:00
AzuleUtama
e2c81535f0 X-ray laser nerf - Falloff and Charge
See here for the main reasoning behind the PR -
https://nanotrasen.se/forum/topic/14790-wanted-unwanted-features-refactors-bugfixes-thread/
2018-11-14 21:12:52 +00:00
Citinited
b07af660ed Lowers min metal return from autolathe to 500, reverts cost of foam darts to 500, 2018-11-09 23:18:54 +00:00
variableundefined
600de8ba24 Deconflict 1 2018-10-21 07:56:55 +08:00
Fox McCloud
3825b4e1d5 Refactors Spark Spread Activation 2018-10-17 14:31:07 -04:00
variableundefined
65c246c1c9 TG container_type refactor 2018-10-13 08:20:52 +08:00
variableundefined
4de5284557 Merge pull request #9677 from DesolateG/global
Updates global lists to the global var subsystem.
2018-10-12 13:18:28 +08:00
Desolate
f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
variableundefined
6b1b38d4f1 Port over tg ore stack and stack merging
Meta

Birbfix

Maxi

Re-add automatic satchel ore pickup (oops)

Mecha formatting

re
2018-10-09 10:06:03 +08:00
variableundefined
c2bf480622 Merge pull request #9631 from Birdtalon/ERT-changes
Gamma ERT Changes
2018-10-09 08:58:15 +08:00
Purpose
4d7dd5a6c9 dayum dats defined 2018-10-08 22:48:00 +01:00
Crazy Lemon
916e0d9a72 Merge pull request #9415 from variableundefined/SpeshulGunlog
Minor attack log overhaul
2018-10-08 01:16:21 -07:00
variableundefined
c96eebb767 Merge pull request #9401 from shazbot194/9mm-enforcers
Updates Enforcers
2018-10-08 08:12:25 +08:00
Birdtalon
f36b0a4bff changes equip_to_slot_or_del() to equip_or_collect() to prevent item deletion from backpack_contents list
numerous bugfixes
adds new suit sprites
2018-10-07 22:32:44 +01:00
Birdtalon
074ee967e5 Merge branch 'master' into ERT-changes 2018-10-07 19:22:10 +01:00
Purpose
05a472756b cheaters 2018-10-07 10:38:07 +01:00
variableundefined
46b00ac8bc Merge pull request #9461 from Birdtalon/bugs
Reduces metal return for ammo boxes
2018-10-07 15:30:37 +08:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Birdtalon
04ebe67db7 materials now scale to contents 2018-10-01 22:38:11 +01:00
Birdtalon
1628467857 Merge branch 'master' into ERT-changes
# Conflicts:
#	icons/mob/head.dmi
2018-09-30 14:53:32 +01:00
Birdtalon
c72561d194 addresses points in Purpose's review. Fixes some spans, replaces some 0,1 with TRUE,FALSE, uses some defines 2018-09-29 20:29:26 +01:00
Purpose
6cb07cb70c Fixes a bunch of shown messages 2018-09-29 19:10:10 +01:00