Commit Graph

4949 Commits

Author SHA1 Message Date
PsiOmega ead0f31426 Revises how Topic and NanoUI shares allowance-logic.
All mob-interaction logic now resides in nanointeraction.dm and is called by the base CanUseTopic().
Specifics for when objects allows mob-interaction can be specified by overriding CanUseTopic(), see machinery.dm.
2015-02-19 18:22:19 +01:00
PsiOmegaDelta 4e785f716a Merge pull request #8160 from mwerezak/stools
Replaces stool structures with stool items
2015-02-18 07:35:54 +01:00
mwerezak 57ffdc82f6 Replaces stool structures with stool items 2015-02-18 01:06:00 -05:00
PsiOmegaDelta fdc15d98fe Merge pull request #8149 from mwerezak/gun-rewrite
[DNM] Projectile and gun fixes
2015-02-17 16:19:41 +01:00
Chinsky eb4a75c9b3 Merge pull request #7986 from Hubblenaut/sprites
Adds on-sprite belt icons
2015-02-17 15:22:16 +03:00
Chinsky e596d45013 Merge pull request #8137 from mwerezak/lexorin
Lexorin cleanup
2015-02-17 11:58:34 +03:00
mwerezak b1546ee3eb Fixes projectiles embedding in mobs that they pass through 2015-02-17 01:36:50 -05:00
Zuhayr bee187d5bc Merge pull request #8143 from PsiOmegaDelta/NanoAI
AI NanoUI subsystems.
2015-02-17 11:50:59 +10:30
Zuhayr 32965840c6 Merge pull request #8145 from PsiOmegaDelta/MultiPad
Allows multiple AIs to share holopad.
2015-02-17 03:33:33 +10:30
PsiOmega f248d7de35 Allows multiple AIs to share holopad. 2015-02-16 17:55:26 +01:00
Zuhayr 4631e53718 Merge pull request #8140 from comma/undies
Underwear closet, crossdressing
2015-02-17 03:03:45 +10:30
Hubblenaut 5eca5d9e37 Merge remote-tracking branch 'upstream/dev' into sprites
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2015-02-16 16:16:30 +01:00
PsiOmega 06335b1064 The AI now has a personal power monitor interface. 2015-02-16 15:12:23 +01:00
PsiOmega 9cd0714c2c The AI now has a personal crew monitor interface. 2015-02-16 14:18:18 +01:00
PsiOmega c6d88bc787 AI NanoUI subsystems.
Allows sharing of NanoUI code between consoles and the AI (and just about anything else).
2015-02-16 13:44:04 +01:00
PsiOmegaDelta 8e0b2a0235 Merge pull request #8139 from mwerezak/fingerprints
Adds fingerprints whenever an item is put in a human's hands
2015-02-16 10:35:01 +01:00
Chinsky f9ba327c3a Merge pull request #8099 from mwerezak/gun-rewrite
Gun rewrite
2015-02-16 11:54:52 +03:00
Chinsky 541bcd757e Merge pull request #8141 from Baystation12/master
master -> dev
2015-02-16 11:53:14 +03:00
Chinsky 3f8462a399 Adds a wardrobe structure to pick your underwear.
Adds ability to wear female underwear as male and vice versa.
Changes 'underwear'/'undershirt' vars to hold iconstate instead of esoteric dances with array indexes.
2015-02-16 11:17:22 +03:00
mwerezak e5d14465b0 Adds fingerprints whenever an item is put in a human's hands. 2015-02-16 02:26:17 -05:00
mwerezak d75379d6af Lexorin causes losebreath instead of oxyloss
Makes lexorin actually do what it's description says, now less deadly as
a side effect.
2015-02-15 19:12:26 -05:00
PsiOmega a48545391a Fixes out of memory runtime errors and excessive HTML parsing.
Announcements are no longer parsed twice, avoiding messages such as "T's nice".
Fixes the strip_html_properly proc, to avoid out of memory runtimes.
2015-02-15 18:03:25 +01:00
mwerezak 13ca926c0f Fixes throwing miss chance using min instead of max
Also adjusted slightly to make throwing a bit more distinct from
projectile weapons. Throwing is worse with range but better up close.
2015-02-14 22:12:42 -05:00
mwerezak f8977c65af Much nicer syringe gun implementation
Makes syringe guns a type of launcher gun, and removes the hack
projectile.
Also moves syringe and dart gun source files into the modules/projectile
folder.
2015-02-13 23:48:35 -05:00
PsiOmega dc1774e23b Adds missing Event cost stat. 2015-02-13 09:43:18 +01:00
mwerezak 0d89717cf2 Merge remote-tracking branch 'upstream/dev' into gun-rewrite
Conflicts:
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/projectiles/guns/projectile/pistol.dm
2015-02-13 01:57:19 -05:00
mwerezak 01798c98b6 Rewrites syringe and dart guns 2015-02-13 01:34:35 -05:00
Zuhayr a8089d4437 Merge master into dev. 2015-02-12 23:01:08 +10:30
mwerezak ea39f7f718 Cleanup can_fire(), projectile flag
Removes can_fire() and moves some of it's functionality into
get_next_projectile(), which was renamed to consume_next_projectile() to
indicate the possibility of side-effects.
Also renamed flag var to check_armour
2015-02-12 01:37:19 -05:00
mwerezak 5740f52964 Merge branch 'guns' into gun-rewrite
Conflicts:
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/under/ties.dm
	code/modules/projectiles/gun.dm
	code/modules/projectiles/guns/energy/laser.dm
	code/modules/projectiles/guns/energy/nuclear.dm
	code/modules/projectiles/guns/energy/pulse.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/modules/projectiles/guns/projectile/launcher.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
2015-02-11 18:08:43 -05:00
mwerezak 611a42bb33 Gun cleanup and rewrite
Rewrites gun.dm. Reorganizes the firing procedure into logical procs and cleans up some unnecessary variables or demotes them to the subtypes that actually care. Energy weapons that create their own projectiles no longer care about in_chamber. Launcher support is much more natural now.

Cleans up duplicated cyborg energy weapon power supply code. Adds support for energy weapons to recharge from external power sources, unifying cyborg and hardsuit mounted weapons. Incorporates the cyborg taser recharging mechanism. Cleans up laser tag gun duplication

Changes path strings to actual paths. Changes relative paths to absolute paths.

Renamed several targeting vars to make their purposes more clear.

Fixed targeting not handling firing correctly for certain subtypes.
2015-02-11 15:46:09 -05:00
mwerezak ab6f0bf30c Merge remote-tracking branch 'upstream/dev' into gun-rewrite
Conflicts:
	code/modules/clothing/under/ties.dm
	code/modules/projectiles/projectile.dm
2015-02-10 20:59:22 -05:00
Chinsky 712b952985 Merge pull request #8089 from GinjaNinja32/pai
NanoUI pAI, more modular pAI software
2015-02-10 10:05:20 +03:00
mwerezak fc6dfb5f1b Ammo magazine and casing update
Rewrites ammo magazines and casings to be a bit more logical.
Updates gun/projectile and all subtypes to work with the new ammo code.
2015-02-09 21:32:49 -05:00
GinjaNinja32 503eb679cc Fixes pAIs being spammed with "You are too small to pull that." when being pulled 2015-02-09 13:32:42 +00:00
GinjaNinja32 70094884ff Fixes, code cleanup, adds the messenger I forgot last night 2015-02-09 10:41:08 +00:00
GinjaNinja32 538ee11cb1 pAI rework 2015-02-09 01:58:54 +00:00
Chinsky 30de86c081 Accessories update.
Moves them away from 'tie' legacy - path change, and different code files.
Changed single hastie var into accessories list, to allow multiple articles worn at same time. Updated all affected places in code to work with it.
Currently any number of decorative accessories can be attached, one utility (holster/webbing) and one armband.
2015-02-08 12:35:50 +03:00
Ccomp5950 8f2720b179 Merge pull request #8052 from mwerezak/boolit
New bullet types, projectile refactor
2015-02-07 14:07:22 -05:00
Ccomp5950 33e2fae704 Merge pull request #7967 from Kelenius/ofSlimesAndHumans
Update for the slimes
2015-02-07 00:20:13 -05:00
mwerezak 0b8940da79 Merge remote-tracking branch 'upstream/dev' into boolit 2015-02-06 20:23:05 -05:00
unknown 39b467c9da New bullet types, projectile rewrite
* Refactors projectile Bump()
* Converts projectile_type var strings to paths
* Reorganizes bullet projectile paths
* Made a pass through all the bullet_act() definitions. Mainly ensured that damage_type is checked when dealing damage to certain objects. Removed stupid /turf bullet_act() override, replaced with on_hit() overrides on the relevant projectiles.

* Adds shotgun pellets projectile. Adds Raptor's shotgun slug sprite.
* Gives stunshots more of their own identity, refluffs them as taser cartridges for shotguns. They still aren't obtainable anywhere unless spawned.
* Makes projectiles pass through girders and cultgirders with a certain probability, unless the girder itself was clicked.
* Projectiles are also able to pass through grilles. Low damage projectiles have a chance to be blocked by grilles. High damage projectiles have a chance to have some damage absorbed by the grille.
* Makes projectiles for blanks invisible.
* Adds flash bullet types
* Adds support for 'penetrating' projectiles
* Swaps .45 and 9mm projectile types. .45s hit slightly harder, 9mils have more ammo capacity.
2015-02-06 20:09:32 -05:00
GinjaNinja32 0651bb8d84 Adds a cache to scramble() so that feeding the same input through multiple times in a short timespan results in the same output string.
This means that you'll no longer get the radio message being entirely different from the non-radio message, and that all players will see the same scrambled string
2015-02-06 23:26:09 +00:00
GinjaNinja32 c95399de91 Fixes "" from languages over radio. 2015-02-06 19:43:39 +00:00
Chinsky 3ddd0b480f Merge pull request #8061 from Baystation12/master
master -> wiz
2015-02-06 10:41:12 +03:00
Chinsky 3df6d38d2d Merge pull request #8047 from Neerti/1_30_2015_new_shuttle
Expanded Escape/Transfer Shuttle
2015-02-06 02:32:04 +03:00
Chinsky 3384f13a31 Merge pull request #8029 from GinjaNinja32/viro
Virology rework
2015-02-06 00:18:13 +03:00
Chinsky 2100c51905 Merge pull request #8042 from PsiOmegaDelta/HearItSayIt
Silicons now have some timestamped input
2015-02-06 00:15:15 +03:00
Chinsky abd3396a13 Merge pull request #8041 from PsiOmegaDelta/SetMyName
Silicons can now more easily be correctly renamed.
2015-02-06 00:15:07 +03:00
Chinsky fc4e6796ce Merge pull request #8035 from PsiOmegaDelta/CanHasNano
NanoUI/Topic make-over
2015-02-06 00:15:04 +03:00